diff -r 000000000000 -r 6474c204b198 js/src/jsapi-tests/testScriptObject.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jsapi-tests/testScriptObject.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,157 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "jsapi-tests/tests.h"
+
+struct ScriptObjectFixture : public JSAPITest {
+    static const int code_size;
+    static const char code[];
+    static jschar uc_code[];
+
+    ScriptObjectFixture()
+    {
+        for (int i = 0; i < code_size; i++)
+            uc_code[i] = code[i];
+    }
+
+    bool tryScript(JS::HandleObject global, JSScript *scriptArg)
+    {
+        JS::RootedScript script(cx, scriptArg);
+        CHECK(script);
+
+        JS_GC(rt);
+
+        /* After a garbage collection, the script should still work. */
+        JS::RootedValue result(cx);
+        CHECK(JS_ExecuteScript(cx, global, script, &result));
+
+        return true;
+    }
+};
+
+const char ScriptObjectFixture::code[] =
+    "(function(a, b){return a+' '+b;}('hello', 'world'))";
+const int ScriptObjectFixture::code_size = sizeof(ScriptObjectFixture::code) - 1;
+jschar ScriptObjectFixture::uc_code[ScriptObjectFixture::code_size];
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScript)
+{
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(__FILE__, __LINE__);
+    return tryScript(global, JS_CompileScript(cx, global, code, code_size,
+                                              options));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScript)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScript_empty)
+{
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(__FILE__, __LINE__);
+    return tryScript(global, JS_CompileScript(cx, global, "", 0, options));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScript_empty)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScriptForPrincipals)
+{
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(__FILE__, __LINE__);
+    return tryScript(global, JS_CompileScript(cx, global, code, code_size,
+                                              options));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScriptForPrincipals)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileUCScript)
+{
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(__FILE__, __LINE__);
+    return tryScript(global, JS_CompileUCScript(cx, global, uc_code, code_size,
+                                                options));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileUCScript)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileUCScript_empty)
+{
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(__FILE__, __LINE__);
+    return tryScript(global, JS_CompileUCScript(cx, global, uc_code, 0,
+                                                options));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileUCScript_empty)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileUCScriptForPrincipals)
+{
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(__FILE__, __LINE__);
+    return tryScript(global, JS_CompileUCScript(cx, global, uc_code, code_size,
+                                                options));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileUCScriptForPrincipals)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFile)
+{
+    TempFile tempScript;
+    static const char script_filename[] = "temp-bug438633_JS_CompileFile";
+    FILE *script_stream = tempScript.open(script_filename);
+    CHECK(fputs(code, script_stream) != EOF);
+    tempScript.close();
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(script_filename, 1);
+    JSScript *script = JS::Compile(cx, global, options, script_filename);
+    tempScript.remove();
+    return tryScript(global, script);
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFile)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFile_empty)
+{
+    TempFile tempScript;
+    static const char script_filename[] = "temp-bug438633_JS_CompileFile_empty";
+    tempScript.open(script_filename);
+    tempScript.close();
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(script_filename, 1);
+    JSScript *script = JS::Compile(cx, global, options, script_filename);
+    tempScript.remove();
+    return tryScript(global, script);
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFile_empty)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandle)
+{
+    const char *script_filename = "temporary file";
+    TempFile tempScript;
+    FILE *script_stream = tempScript.open("temp-bug438633_JS_CompileFileHandle");
+    CHECK(fputs(code, script_stream) != EOF);
+    CHECK(fseek(script_stream, 0, SEEK_SET) != EOF);
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(script_filename, 1);
+    return tryScript(global, JS::Compile(cx, global, options, script_stream));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandle)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandle_empty)
+{
+    const char *script_filename = "empty temporary file";
+    TempFile tempScript;
+    FILE *script_stream = tempScript.open("temp-bug438633_JS_CompileFileHandle_empty");
+    JS::CompileOptions options(cx);
+    options.setFileAndLine(script_filename, 1);
+    return tryScript(global, JS::Compile(cx, global, options, script_stream));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandle_empty)
+
+BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandleForPrincipals)
+{
+    TempFile tempScript;
+    FILE *script_stream = tempScript.open("temp-bug438633_JS_CompileFileHandleForPrincipals");
+    CHECK(fputs(code, script_stream) != EOF);
+    CHECK(fseek(script_stream, 0, SEEK_SET) != EOF);
+    JS::CompileOptions options(cx);
+    options.setFileAndLine("temporary file", 1);
+    return tryScript(global, JS::Compile(cx, global, options, script_stream));
+}
+END_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandleForPrincipals)