-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix compilation when we can't cache object layout for object creation…
… (#213)
- Loading branch information
Showing
33 changed files
with
34 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/compiler/ClassGenerationContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/compiler/MethodGenerationContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/compiler/bc/BytecodeGenerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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] | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/interpreter/FrameOnStackMarker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/interpreter/nodes/ContextualNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/interpreter/nodes/ExpressionNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/interpreter/nodes/GlobalNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/interpreter/nodes/ReturnNonLocalNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/interpreter/nodes/SequenceNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
2 changes: 1 addition & 1 deletion
2
src/trufflesom/src/trufflesom/interpreter/nodes/literals/LiteralNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
@@ -73,6 +73,7 @@ public SObject(final SClass instanceClass) { | |
} | ||
|
||
public SObject(final SClass instanceClass, final ObjectLayout layout) { | ||
CompilerAsserts.partialEvaluationConstant(layout); | ||
clazz = instanceClass; | ||
setLayoutInitially(layout); | ||
} | ||
|
@@ -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; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|