Skip to content

Commit

Permalink
Fix compilation when we can't cache object layout for object creation…
Browse files Browse the repository at this point in the history
… (#213)
  • Loading branch information
smarr authored Aug 14, 2024
2 parents e2e986d + f2cdca2 commit a729177
Show file tree
Hide file tree
Showing 33 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion som
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ if not args.interpreter and args.graal_branch_profile:
'-Dpolyglot.engine.InstrumentBranchesPerInlineSite=true']

if not args.interpreter and args.perf_warnings:
flags += ['-Dpolyglot.engine.CompilationExceptionsAreFatal=true',
flags += ['-Dpolyglot.engine.CompilationFailureAction=ExitVM',
'-Dpolyglot.engine.TracePerformanceWarnings=all',
'-Dpolyglot.engine.TraceCompilation=true',
'-Dpolyglot.engine.TraceCompilationDetails=true']
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/compiler/Disassembler.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/compiler/Lexer.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/compiler/Parser.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/compiler/Symbol.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2017 Michael Haupt, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2017 Michael Haupt, [email protected]
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/interpreter/Method.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/interpreter/Types.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2017 Michael Haupt, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/primitives/Primitives.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/vm/Shell.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/vm/Universe.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/vmobjects/SBlock.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/vmobjects/SClass.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/vmobjects/SInvokable.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
Expand Down
4 changes: 2 additions & 2 deletions src/trufflesom/src/trufflesom/vmobjects/SObject.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down Expand Up @@ -73,6 +73,7 @@ public SObject(final SClass instanceClass) {
}

public SObject(final SClass instanceClass, final ObjectLayout layout) {
CompilerAsserts.partialEvaluationConstant(layout);
clazz = instanceClass;
setLayoutInitially(layout);
}
Expand Down Expand Up @@ -122,7 +123,6 @@ public final void setClass(final SClass value) {

private static long[] getExtendedPrimStorage(final ObjectLayout layout) {
int numExtFields = layout.getNumberOfUsedExtendedPrimStorageLocations();
CompilerAsserts.partialEvaluationConstant(numExtFields);
if (numExtFields == 0) {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/trufflesom/src/trufflesom/vmobjects/SSymbol.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2009 Michael Haupt, [email protected]
* Software Architecture Group, Hasso Plattner Institute, Potsdam, Germany
* http://www.hpi.uni-potsdam.de/swa/
Expand Down
2 changes: 1 addition & 1 deletion tests/trufflesom/tests/BasicInterpreterTests.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
2 changes: 1 addition & 1 deletion tests/trufflesom/tests/SomTests.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Copyright (c) 2013 Stefan Marr, [email protected]
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down

0 comments on commit a729177

Please sign in to comment.