Skip to content

Fix string equals if other is null and string constant pool #3

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

Open
mmuesly wants to merge 1 commit into
base: declarative-config
Choose a base branch
from
Open

Fix string equals if other is null and string constant pool #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions ...o/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,11 +2136,9 @@ private void putPoolConstant(VirtualFrame frame, int top, char cpi, int opcode)
} else if (constant instanceof StringConstant) {
assert opcode == LDC || opcode == LDC_W;
StaticObject internedString = pool.resolvedStringAt(cpi);
Meta meta = getMeta();
StaticObject obj = meta.toGuestString(meta.toHostString(internedString));
Copy link
Member Author

@mmuesly mmuesly Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fhowar I don't know why you added this and whether it is really necessary.
The constant op code does not need it and all other exceptions should be handled in the markObjectWithIfTaint method, IMHO.

SPouT.markObjectWithIFTaint(obj);
SPouT.markObjectWithIFTaint(internedString);
//TODO: (annotate string and maybe clone?)
putObject(frame, top, obj);
putObject(frame, top, internedString);
} else if (constant instanceof ClassConstant) {
assert opcode == LDC || opcode == LDC_W;
Klass klass = pool.resolvedKlassAt(getDeclaringKlass(), cpi);
Expand Down
4 changes: 4 additions & 0 deletions espresso/src/com.oracle.truffle.espresso/src/tools/aqua/spout/SPouT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,10 @@ public static StaticObject stringConcat(StaticObject self, StaticObject other, M

@CompilerDirectives.TruffleBoundary
public static Object stringEquals(StaticObject self, StaticObject other, Meta meta) {
// other might be null
if(!other.isString()){
return false;
}
String cSelf = meta.toHostString(self);
String cOther = meta.toHostString(other);
boolean areEqual = cSelf.equals(cOther);
Expand Down