Skip to content

PoC: Context.close() is idempotent because Context is an interface now #2012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rPraml wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

PoC: Context.close() is idempotent because Context is an interface now #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
937732f
Testcase for context.close
rPraml Aug 11, 2025
12cce9f
Context becomes an interface and close will be idempotent
rPraml Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rhino-engine/src/main/java/org/mozilla/javascript/engine/RhinoScriptEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ private void configureContext(Context cx) throws ScriptException {
Object ol = get(OPTIMIZATION_LEVEL);
if (ol != null) {
// Handle backwardly-compatible "optimization level".
cx.setOptimizationLevel(parseInteger(ol));
cx.impl().setOptimizationLevel(parseInteger(ol));
}
Object interpreted = get(INTERPRETED_MODE);
if (interpreted != null) {
Expand Down
30 changes: 15 additions & 15 deletions rhino/src/main/java/org/mozilla/javascript/BaseFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,15 @@ private static Scriptable js_gen_constructorCall(
private static Scriptable js_constructor(Context cx, Scriptable scope, Object[] args) {
if (cx.isStrictMode()) {
// Disable strict mode forcefully, and restore it after the call
NativeCall activation = cx.currentActivationCall;
boolean strictMode = cx.isTopLevelStrict;
NativeCall activation = cx.impl().currentActivationCall;
boolean strictMode = cx.impl().isTopLevelStrict;
try {
cx.currentActivationCall = null;
cx.isTopLevelStrict = false;
cx.impl().currentActivationCall = null;
cx.impl().isTopLevelStrict = false;
return jsConstructor(cx, scope, args, false);
} finally {
cx.isTopLevelStrict = strictMode;
cx.currentActivationCall = activation;
cx.impl().isTopLevelStrict = strictMode;
cx.impl().currentActivationCall = activation;
}
} else {
return jsConstructor(cx, scope, args, false);
Expand All @@ -443,15 +443,15 @@ private static Scriptable js_constructorCall(
private static Scriptable js_gen_constructor(Context cx, Scriptable scope, Object[] args) {
if (cx.isStrictMode()) {
// Disable strict mode forcefully, and restore it after the call
NativeCall activation = cx.currentActivationCall;
boolean strictMode = cx.isTopLevelStrict;
NativeCall activation = cx.impl().currentActivationCall;
boolean strictMode = cx.impl().isTopLevelStrict;
try {
cx.currentActivationCall = null;
cx.isTopLevelStrict = false;
cx.impl().currentActivationCall = null;
cx.impl().isTopLevelStrict = false;
return jsConstructor(cx, scope, args, true);
} finally {
cx.isTopLevelStrict = strictMode;
cx.currentActivationCall = activation;
cx.impl().isTopLevelStrict = strictMode;
cx.impl().currentActivationCall = activation;
}
} else {
return jsConstructor(cx, scope, args, true);
Expand Down Expand Up @@ -704,7 +704,7 @@ private static Scriptable jsConstructor(
String source = sourceBuf.toString();

int[] linep = new int[1];
String filename = Context.getSourcePositionFromStack(linep);
String filename = ContextImpl.getSourcePositionFromStack(linep);
if (filename == null) {
filename = "<eval'ed string>";
linep[0] = 1;
Expand All @@ -717,14 +717,14 @@ private static Scriptable jsConstructor(
ErrorReporter reporter;
reporter = DefaultErrorReporter.forEval(cx.getErrorReporter());

Evaluator evaluator = Context.createInterpreter();
Evaluator evaluator = ContextImpl.createInterpreter();
if (evaluator == null) {
throw new JavaScriptException("Interpreter not present", filename, linep[0]);
}

// Compile with explicit interpreter instance to force interpreter
// mode.
return cx.compileFunction(global, source, evaluator, reporter, sourceURI, 1, null);
return cx.impl().compileFunction(global, source, evaluator, reporter, sourceURI, 1, null);
}

public void setHomeObject(Scriptable homeObject) {
Expand Down
4 changes: 2 additions & 2 deletions rhino/src/main/java/org/mozilla/javascript/CompilerEnvirons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void initFromContext(Context cx) {
interpretedMode = cx.isInterpretedMode();

generatingSource = cx.isGeneratingSource();
activationNames = cx.activationNames;
activationNames = cx.impl().activationNames;

// Observer code generation in compiled code :
generateObserverCount = cx.isGenerateObserverCount();
Expand Down Expand Up @@ -116,7 +116,7 @@ public final boolean isInterpretedMode() {
@Deprecated
@SuppressWarnings("deprecation")
public void setOptimizationLevel(int level) {
Context.checkOptimizationLevel(level);
ContextImpl.checkOptimizationLevel(level);
interpretedMode = (level < 0);
}

Expand Down
Loading
Loading