Skip to content

Commit 0700bcf

Browse files
committed
MarshalModuleBuiltins: code marshalling use interned strings for filename
1 parent 0750f95 commit 0700bcf

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
8383
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
8484
import com.oracle.graal.python.nodes.statement.ExceptionHandlingStatementNode;
85+
import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
8586
import com.oracle.graal.python.parser.sst.SerializationUtils;
8687
import com.oracle.graal.python.runtime.ExecutionContext.ForeignCallContext;
8788
import com.oracle.graal.python.runtime.PythonContext;
@@ -94,6 +95,7 @@
9495
import com.oracle.truffle.api.TruffleFile;
9596
import com.oracle.truffle.api.TruffleLanguage.Env;
9697
import com.oracle.truffle.api.TruffleLogger;
98+
import com.oracle.truffle.api.dsl.Cached;
9799
import com.oracle.truffle.api.dsl.CachedContext;
98100
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
99101
import com.oracle.truffle.api.dsl.NodeFactory;
@@ -533,8 +535,9 @@ PBytes run(PInt magicNumber, PBytesLike source) {
533535
@GenerateNodeFactory
534536
public abstract static class FixCoFilename extends PythonBinaryBuiltinNode {
535537
@Specialization
536-
public Object run(PCode code, PString path) {
537-
code.setFilename(path.getValue());
538+
public Object run(PCode code, PString path,
539+
@Cached CastToJavaStringNode castToJavaStringNode) {
540+
code.setFilename(castToJavaStringNode.execute(path));
538541
return PNone.NONE;
539542
}
540543

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ private PComplex readPComplex() {
646646

647647
private PCode readCode(int depth, HashingStorageLibrary lib) {
648648
String sourceCode = readString();
649-
String fileName = readString();
649+
String fileName = readInternedString();
650650
String name = readString();
651651
int nLocals = readInt();
652652
int stackSize = readInt();

0 commit comments

Comments
 (0)