From 4ae147241a00b6ebea91f9cdc4bfb2441fbbf7d0 Mon Sep 17 00:00:00 2001
From: David Fugate <dfugate@microsoft.com>
Date: Fri, 9 Mar 2012 11:54:51 -0800
Subject: https://bugs.ecmascript.org/show_bug.cgi?id=294 partially fixed.
 Still need to move some tests over to best practices.

---
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js  | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js  | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js | 4 ++--
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js  | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js  | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js | 2 +-
 test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js | 2 +-
 51 files changed, 52 insertions(+), 52 deletions(-)

(limited to 'test')

diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
index 100f76d04..e4709e980 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
@@ -16,6 +16,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
index 6885c26bd..7e2bddb40 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
@@ -19,6 +19,6 @@ new f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
index 6614a0c44..9282dfb62 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
@@ -19,6 +19,6 @@ new f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
index 561d17609..654b3ead7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
@@ -18,6 +18,6 @@ var obj = new (function () {
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
index 394a0ca1b..ac0a73919 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
@@ -19,6 +19,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
index 89f0ed9f4..8928186ac 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
index fee03d2f5..eae058954 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
index 1f930c6c1..68e6e8e5f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
index 14572a384..5186ef4a3 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
index 79cbebef3..728330d49 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
index efb05229c..f78ae96e9 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
index 3dad8c657..4dca56c3b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
index 6e2435e55..866802a24 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
index bb407cd80..aa9734eb5 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
@@ -20,6 +20,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
index e0f16c04a..a60706623 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
index 45bdfa985..e96e2440e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
index f5320835f..f6c72bea7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
index 1652ba2e7..32efa2793 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
index 9afbd5b78..3dd7ff941 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
index 2e3a17181..354c354e0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
index 6bcd450e5..16b05ee24 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
index 19c4c0118..93e0beda4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
index 2585ffada..b68de18d7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
@@ -20,6 +20,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
index 7c15d658f..3eae7b11d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
@@ -16,6 +16,6 @@ o.foo;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
index ff74cca73..f6fd1036d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
@@ -19,6 +19,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
index 3e20be833..49b69f4b9 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
@@ -16,6 +16,6 @@ o.foo = 8;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
index fa48e9ff3..6c6bd48a8 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
@@ -6,7 +6,7 @@
 /**
  * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
  * @description Strict mode - checking access to strict function caller from non-strict function (Injected getter includes strict directive prologue)
- * @onlyStrict
+ * @noStrict
  * @negative TypeError
  */
 
@@ -17,6 +17,6 @@ o.foo;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
index b8d2e0b91..2739fa9e0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
@@ -17,6 +17,6 @@ o.foo = 10;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
index aa99b681b..0b58b9453 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
@@ -17,6 +17,6 @@ foo();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
index 3712fe61a..b13890cd3 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
@@ -16,6 +16,6 @@ eval("f();");
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
index 26bbfe19a..e418493a1 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
@@ -16,6 +16,6 @@ Function("return f();")();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
index b609b48ff..a66ea00ca 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
@@ -16,6 +16,6 @@ new Function("return f();")();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
index c91642572..aaf42d98a 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
@@ -16,6 +16,6 @@ f.apply();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
index 771dd2ef7..9c100aef0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
@@ -16,6 +16,6 @@ f.apply(null);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
index bd9ba09e7..fe4cfd658 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
@@ -16,6 +16,6 @@ f.apply(undefined);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
index ef84442bb..6a77440dd 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
@@ -17,6 +17,6 @@ f.apply(o);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
index a0344a048..5d630796e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
@@ -16,6 +16,6 @@ f.apply(fnGlobalObject());
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
index e9436fd7c..5447227df 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
@@ -16,6 +16,6 @@ f.call();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
index 8a8cd66fd..b6a287d97 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
@@ -16,6 +16,6 @@ f.call(null);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
index 252e8cb1f..27bf71a06 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
@@ -16,6 +16,6 @@ f.call(undefined);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
index 3cfa8b92d..a6f6d9e62 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
@@ -17,6 +17,6 @@ f.call(o);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
index 1d9f34e88..124c0d09a 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
@@ -16,6 +16,6 @@ f.call(fnGlobalObject());
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
index 0bdc614fe..7a46ca1a7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
@@ -18,6 +18,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
index 07d72f34e..587cd4d3d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
@@ -16,6 +16,6 @@ f.bind()();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
index 83731803a..6a931da77 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
@@ -16,6 +16,6 @@ f.bind(null)();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
index ae3eb19bc..03c60ba4f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
@@ -16,6 +16,6 @@ f.bind(undefined)();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
index b6ddf424c..9ba366171 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
@@ -17,6 +17,6 @@ f.bind(o)();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
index 355ffc0b8..dcd3a636d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
@@ -16,6 +16,6 @@ f.bind(fnGlobalObject())();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
index 52a3cd0a8..ccaa39bc9 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
@@ -16,6 +16,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
index 4fbed6d0f..1bfe4693f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
@@ -11,7 +11,7 @@
  */
 
 var gNonStrict = function () {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
 function f() {
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
index 706ab9dff..52c3a2e8a 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
@@ -10,7 +10,7 @@
  * @negative TypeError
  */
 
-var gNonStrict = Function("return gNonStrict.caller;");
+var gNonStrict = Function("return gNonStrict.caller || gNonStrict.caller.throwTypeError;");
 
 function f() {
     "use strict";
-- 
cgit v1.2.3