diff --git a/.classpath b/.classpath index 308e984d7..fa34a17d2 100644 --- a/.classpath +++ b/.classpath @@ -5,6 +5,7 @@ + diff --git a/.travis.yml b/.travis.yml index d5db1af26..a199e11e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,13 @@ jdk: - oraclejdk8 sudo: false env: - matrix: - - TASK=tests - - TASK=checkstyle - - TASK=kompos global: - secure: PrFbSr/qjhVXrpiOzrcEMUZrnjEWJmvx5DC9QdaAmnUKpG9/7mJBQVgNziVj+GWfW84WJpkOsQf+I2lx7/cQsWQKad/t8wtypl30wGesSTpAgl5fCiKLOBAbOghKXir+WIaxtcATPPffur9OLh3ogEcmIQbVi682YUKmA5zF11JZdpCR4QONc/u+DqB29FuHru/cFiesYP0Oz82A+M0UtMcYsurKIxdKMD4YK/uSG892PUrcZU6STXlukhgQuy3PitSWkYV2KGxXMVKzWGM7dJvRggN05r/S871pscuRwZ+Doxqr9b17B3umCHi3i4KXmNH+Esb0p1mvegs0iS/b7RyA5SENre+H24n3SOeXTa3wSpTnF90XxQrDEBbY5wV7lN7MJG+pHxkOvoZt6pS3f7x2VYR8Joa4J+Gf6IDvxZMiCd1v3N1kc9ygyvJmHf5wDmLMdupk0/frojApDXfJT6bqiVL3S0FqZpXSPGAsKYf8wfn30Xz/YUBsnfUQ/a21Zz52+OTqPbt32Hf1FGYIEJSkZJUN90Q8rHVJt9zPg37xKCDuf6bxlvT040KSzuuXtizLkOnHq2rhg4Oad/JTw3d4NzPoRVzUI9qDKPrA7RdUAjmrB04Z1f3g/I6w3h2B9JTSFAzBcMZ5NYZhIqE31GQukgStaqC98y32/zo9xFs= + - secure: PrFbSr/qjhVXrpiOzrcEMUZrnjEWJmvx5DC9QdaAmnUKpG9/7mJBQVgNziVj+GWfW84WJpkOsQf+I2lx7/cQsWQKad/t8wtypl30wGesSTpAgl5fCiKLOBAbOghKXir+WIaxtcATPPffur9OLh3ogEcmIQbVi682YUKmA5zF11JZdpCR4QONc/u+DqB29FuHru/cFiesYP0Oz82A+M0UtMcYsurKIxdKMD4YK/uSG892PUrcZU6STXlukhgQuy3PitSWkYV2KGxXMVKzWGM7dJvRggN05r/S871pscuRwZ+Doxqr9b17B3umCHi3i4KXmNH+Esb0p1mvegs0iS/b7RyA5SENre+H24n3SOeXTa3wSpTnF90XxQrDEBbY5wV7lN7MJG+pHxkOvoZt6pS3f7x2VYR8Joa4J+Gf6IDvxZMiCd1v3N1kc9ygyvJmHf5wDmLMdupk0/frojApDXfJT6bqiVL3S0FqZpXSPGAsKYf8wfn30Xz/YUBsnfUQ/a21Zz52+OTqPbt32Hf1FGYIEJSkZJUN90Q8rHVJt9zPg37xKCDuf6bxlvT040KSzuuXtizLkOnHq2rhg4Oad/JTw3d4NzPoRVzUI9qDKPrA7RdUAjmrB04Z1f3g/I6w3h2B9JTSFAzBcMZ5NYZhIqE31GQukgStaqC98y32/zo9xFs= + matrix: + - TASK=tests + - TASK=checkstyle + - TASK=kompos script: - - if [ "$TASK" = "tests" ]; then ant tests; ./som -G --coveralls $COVERALLS_REPO_TOKEN core-lib/TestSuite/TestRunner.som; fi + - if [ "$TASK" = "tests" ]; then ant tests; ./som -G --coveralls "$COVERALLS_REPO_TOKEN" core-lib/TestSuite/TestRunner.som; fi - if [ "$TASK" = "checkstyle" ]; then ant checkstyle; fi - if [ "$TASK" = "kompos" ]; then nvm install 6 && ant && cd tools/kompos && npm install && npm test; fi diff --git a/src/som/VMOptions.java b/src/som/VMOptions.java index 826cc210c..4922943b1 100644 --- a/src/som/VMOptions.java +++ b/src/som/VMOptions.java @@ -41,7 +41,7 @@ private String[] processVmArguments(final String[] arguments) { while (parsedArgument) { if (currentArg >= arguments.length) { - return null; + return new String[0]; } else { if (arguments[currentArg].equals("--platform")) { platformFile = arguments[currentArg + 1]; @@ -75,7 +75,7 @@ private String[] processVmArguments(final String[] arguments) { if (currentArg < arguments.length) { return Arrays.copyOfRange(arguments, currentArg, arguments.length); } else { - return null; + return new String[0]; } } diff --git a/src/som/compiler/MethodBuilder.java b/src/som/compiler/MethodBuilder.java index 0cd4fe118..8944735db 100644 --- a/src/som/compiler/MethodBuilder.java +++ b/src/som/compiler/MethodBuilder.java @@ -40,6 +40,7 @@ import som.VM; import som.compiler.MixinBuilder.MixinDefinitionError; import som.compiler.MixinBuilder.MixinDefinitionId; +import som.compiler.ProgramDefinitionError.SemanticDefinitionError; import som.compiler.Variable.Argument; import som.compiler.Variable.Local; import som.interpreter.LexicalScope.MethodScope; @@ -111,6 +112,14 @@ private MethodBuilder(final MixinBuilder holder, final MixinScope clsScope, embeddedBlockMethods = new ArrayList(); } + public static class MethodDefinitionError extends SemanticDefinitionError { + private static final long serialVersionUID = 3901992766649011815L; + + MethodDefinitionError(final String message, final SourceSection source) { + super(message, source); + } + } + public Collection getArguments() { return arguments.values(); } @@ -264,7 +273,8 @@ public void addArgumentIfAbsent(final String arg, final SourceSection source) { addArgument(arg, source); } - public void addLocalIfAbsent(final String local, final SourceSection source) { + public void addLocalIfAbsent(final String local, final SourceSection source) + throws MethodDefinitionError { if (locals.containsKey(local)) { return; } @@ -272,7 +282,12 @@ public void addLocalIfAbsent(final String local, final SourceSection source) { addLocal(local, source); } - public Local addLocal(final String local, final SourceSection source) { + public Local addLocal(final String local, final SourceSection source) + throws MethodDefinitionError { + if (arguments.containsKey(local)) { + throw new MethodDefinitionError("Method already defines argument " + local + ". Can't define local variable with same name.", source); + } + Local l = new Local( local, currentScope.getFrameDescriptor().addFrameSlot(local), source); assert !locals.containsKey(local); diff --git a/src/som/compiler/MixinBuilder.java b/src/som/compiler/MixinBuilder.java index 3f0650164..96e747746 100644 --- a/src/som/compiler/MixinBuilder.java +++ b/src/som/compiler/MixinBuilder.java @@ -37,6 +37,7 @@ import som.compiler.MixinDefinition.ClassSlotDefinition; import som.compiler.MixinDefinition.SlotDefinition; import som.compiler.MixinDefinition.SlotMutator; +import som.compiler.ProgramDefinitionError.SemanticDefinitionError; import som.compiler.Variable.Argument; import som.interpreter.LexicalScope.MixinScope; import som.interpreter.Method; @@ -151,20 +152,11 @@ public MixinBuilder(final MixinBuilder outerBuilder, this.structuralProbe = structuralProbe; } - public static class MixinDefinitionError extends Exception { - private static final long serialVersionUID = 9200967710874738189L; - private final String message; - private final SourceSection source; + public static class MixinDefinitionError extends SemanticDefinitionError { + private static final long serialVersionUID = 5030639383869198851L; MixinDefinitionError(final String message, final SourceSection source) { - this.message = message; - this.source = source; - } - - @Override - public String toString() { - return source.getSource().getName() + ":" + source.getStartLine() + ":" + - source.getStartColumn() + ":error: " + message; + super(message, source); } } diff --git a/src/som/compiler/Parser.java b/src/som/compiler/Parser.java index 3f5bee6ab..c5a8a931f 100644 --- a/src/som/compiler/Parser.java +++ b/src/som/compiler/Parser.java @@ -78,6 +78,7 @@ import som.VM; import som.VmSettings; import som.compiler.Lexer.Peek; +import som.compiler.MethodBuilder.MethodDefinitionError; import som.compiler.MixinBuilder.MixinDefinitionError; import som.compiler.Variable.Local; import som.interpreter.SNodeFactory; @@ -161,9 +162,8 @@ public String toString() { return "Parser(" + source.getName() + ", " + this.getCoordinate().toString() + ")"; } - public static class ParseError extends Exception { + public static class ParseError extends ProgramDefinitionError { private static final long serialVersionUID = 425390202979033628L; - private final String message; private final SourceCoordinate sourceCoordinate; private final String text; private final String rawBuffer; @@ -172,7 +172,7 @@ public static class ParseError extends Exception { private final Symbol found; ParseError(final String message, final Symbol expected, final Parser parser) { - this.message = message; + super(message); this.sourceCoordinate = parser.getCoordinate(); this.text = parser.text; this.rawBuffer = parser.lexer.getRawBuffer(); @@ -191,7 +191,7 @@ public SourceCoordinate getSourceCoordinate() { @Override public String getMessage() { - String msg = message; + String msg = super.getMessage(); String foundStr; if (Parser.printableSymbol(found)) { @@ -209,7 +209,7 @@ public String getMessage() { @Override public String toString() { - String msg = "%(file)s:%(line)d:%(column)d: error: " + message; + String msg = "%(file)s:%(line)d:%(column)d: error: " + super.getMessage(); String foundStr; if (Parser.printableSymbol(found)) { foundStr = found + " (" + text + ")"; @@ -279,7 +279,7 @@ public SourceCoordinate getCoordinate() { return lexer.getStartCoordinate(); } - public MixinBuilder moduleDeclaration() throws ParseError, MixinDefinitionError { + public MixinBuilder moduleDeclaration() throws ProgramDefinitionError { comment(); return classDeclaration(null, AccessModifier.PUBLIC); } @@ -291,7 +291,7 @@ protected String className() throws ParseError { } private MixinBuilder classDeclaration(final MixinBuilder outerBuilder, - final AccessModifier accessModifier) throws ParseError, MixinDefinitionError { + final AccessModifier accessModifier) throws ProgramDefinitionError { expectIdentifier("class", "Found unexpected token %(found)s. " + "Tried parsing a class declaration and expected 'class' instead.", KeywordTag.class); @@ -328,7 +328,7 @@ private MixinBuilder classDeclaration(final MixinBuilder outerBuilder, } private void inheritanceListAndOrBody(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { if (sym == NewTerm) { defaultSuperclassAndBody(mxnBuilder); } else { @@ -337,7 +337,7 @@ private void inheritanceListAndOrBody(final MixinBuilder mxnBuilder) } private void defaultSuperclassAndBody(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { SourceSection source = getEmptySource(); MethodBuilder def = mxnBuilder.getClassInstantiationMethodBuilder(); ExpressionNode selfRead = def.getSelfRead(source); @@ -352,7 +352,7 @@ private void defaultSuperclassAndBody(final MixinBuilder mxnBuilder) } private void explicitInheritanceListAndOrBody(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { SourceCoordinate superAndMixinCoord = getCoordinate(); inheritanceClause(mxnBuilder); @@ -377,7 +377,7 @@ private void explicitInheritanceListAndOrBody(final MixinBuilder mxnBuilder) } private void mixinApplication(final MixinBuilder mxnBuilder, final int mixinId) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { expect(MixinOperator, KeywordTag.class); SourceCoordinate coord = getCoordinate(); @@ -407,7 +407,7 @@ private void mixinApplication(final MixinBuilder mxnBuilder, final int mixinId) } private void inheritanceClause(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { ExpressionNode superClassResolution = inheritancePrefixAndSuperclass(mxnBuilder); mxnBuilder.setSuperClassResolution(superClassResolution); @@ -463,8 +463,7 @@ private ExpressionNode inheritancePrefixAndSuperclass( return unaryMessage(self, false, null); } - private void classBody(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + private void classBody(final MixinBuilder mxnBuilder) throws ProgramDefinitionError { classHeader(mxnBuilder); sideDeclaration(mxnBuilder); if (sym == Colon) { @@ -473,7 +472,7 @@ private void classBody(final MixinBuilder mxnBuilder) } private void classSideDecl(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { mxnBuilder.switchToClassSide(); expect(Colon, KeywordTag.class); @@ -487,7 +486,7 @@ private void classSideDecl(final MixinBuilder mxnBuilder) } private void classHeader(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { expect(NewTerm, null); classComment(mxnBuilder); @@ -533,7 +532,7 @@ private String comment() throws ParseError { } private void slotDeclarations(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { // Newspeak-speak: we do not support simSlotDecls, i.e., // simultaneous slots clauses (spec 6.3.2) expect(Or, DelimiterOpeningTag.class); @@ -548,7 +547,7 @@ private void slotDeclarations(final MixinBuilder mxnBuilder) } private void slotDefinition(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { comment(); if (sym == Or) { return; } @@ -588,8 +587,7 @@ private String slotDecl() throws ParseError { return identifier(); } - private void initExprs(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + private void initExprs(final MixinBuilder mxnBuilder) throws ProgramDefinitionError { MethodBuilder initializer = mxnBuilder.getInitializerMethodBuilder(); mxnBuilder.addInitializerExpression(expression(initializer)); @@ -600,8 +598,7 @@ private void initExprs(final MixinBuilder mxnBuilder) } } - private void sideDeclaration(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + private void sideDeclaration(final MixinBuilder mxnBuilder) throws ProgramDefinitionError { expect(NewTerm, DelimiterOpeningTag.class); comment(); @@ -618,16 +615,14 @@ private void sideDeclaration(final MixinBuilder mxnBuilder) expect(EndTerm, DelimiterClosingTag.class); } - private void nestedClassDeclaration(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + private void nestedClassDeclaration(final MixinBuilder mxnBuilder) throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); AccessModifier accessModifier = accessModifier(); MixinBuilder nestedCls = classDeclaration(mxnBuilder, accessModifier); mxnBuilder.addNestedMixin(nestedCls.assemble(getSource(coord))); } - private void category(final MixinBuilder mxnBuilder) - throws ParseError, MixinDefinitionError { + private void category(final MixinBuilder mxnBuilder) throws ProgramDefinitionError { String categoryName; // Newspeak-spec: this is not conform with Newspeak, // as the category is normally not optional @@ -746,7 +741,7 @@ public SourceSection getSource(final SourceCoordinate coord) { } private void methodDeclaration(final MixinBuilder mxnBuilder, - final SSymbol category) throws ParseError, MixinDefinitionError { + final SSymbol category) throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); AccessModifier accessModifier = accessModifier(); @@ -812,7 +807,7 @@ protected void keywordPattern(final MethodBuilder builder) throws ParseError { } private ExpressionNode methodBlock(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); expect(NewTerm, DelimiterOpeningTag.class); @@ -866,7 +861,7 @@ private String argument() throws ParseError { } private ExpressionNode blockContents(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { comment(); if (accept(Or, DelimiterOpeningTag.class)) { locals(builder); @@ -875,7 +870,7 @@ private ExpressionNode blockContents(final MethodBuilder builder) return blockBody(builder); } - private void locals(final MethodBuilder builder) throws ParseError { + private void locals(final MethodBuilder builder) throws ParseError, MethodDefinitionError { while (sym == Identifier) { SourceCoordinate coord = getCoordinate(); String id = identifier(); @@ -885,8 +880,7 @@ private void locals(final MethodBuilder builder) throws ParseError { } } - private ExpressionNode blockBody(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + private ExpressionNode blockBody(final MethodBuilder builder) throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); List expressions = new ArrayList(); @@ -921,7 +915,7 @@ private ExpressionNode blockBody(final MethodBuilder builder) } private ExpressionNode result(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); ExpressionNode exp = expression(builder); @@ -935,7 +929,7 @@ private ExpressionNode result(final MethodBuilder builder) } private ExpressionNode expression(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { comment(); peekForNextSymbolFromLexer(); @@ -947,12 +941,12 @@ private ExpressionNode expression(final MethodBuilder builder) } private ExpressionNode assignation(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { return assignments(builder); } protected ExpressionNode assignments(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); if (sym != Identifier) { @@ -981,7 +975,7 @@ protected SSymbol assignment() throws ParseError { } private ExpressionNode evaluation(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { ExpressionNode exp; if (sym == Keyword) { exp = keywordMessage(builder, builder.getSelfRead(getEmptySource()), false, false, null); @@ -999,8 +993,7 @@ private boolean symIsMessageSend() { || symIn(binaryOpSyms) || sym == EventualSend; } - private ExpressionNode primary(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + private ExpressionNode primary(final MethodBuilder builder) throws ProgramDefinitionError { switch (sym) { case Identifier: { SourceCoordinate coord = getCoordinate(); @@ -1051,7 +1044,7 @@ private ExpressionNode primary(final MethodBuilder builder) } private ExpressionNode outerSend(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); expectIdentifier("outer", KeywordTag.class); String outer = identifier(); @@ -1063,8 +1056,7 @@ private ExpressionNode outerSend(final MethodBuilder builder) protected ExpressionNode binaryConsecutiveMessages( final MethodBuilder builder, ExpressionNode operand, - boolean eventualSend, SourceSection sendOp) throws ParseError, - MixinDefinitionError { + boolean eventualSend, SourceSection sendOp) throws ProgramDefinitionError { while (sym == OperatorSequence || symIn(binaryOpSyms)) { operand = binaryMessage(builder, operand, eventualSend, sendOp); SourceCoordinate coord = getCoordinate(); @@ -1078,7 +1070,7 @@ protected ExpressionNode binaryConsecutiveMessages( } private ExpressionNode messages(final MethodBuilder builder, - final ExpressionNode receiver) throws ParseError, MixinDefinitionError { + final ExpressionNode receiver) throws ProgramDefinitionError { ExpressionNode msg; SourceCoordinate coord = getCoordinate(); boolean eventualSend = accept(EventualSend, KeywordTag.class); @@ -1152,8 +1144,7 @@ private ExpressionNode tryInliningBinaryMessage(final MethodBuilder builder, protected ExpressionNode binaryMessage(final MethodBuilder builder, final ExpressionNode receiver, final boolean eventualSend, - final SourceSection sendOperator) - throws ParseError, MixinDefinitionError { + final SourceSection sendOperator) throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); SSymbol msg = binarySelector(); ExpressionNode operand = binaryOperand(builder); @@ -1169,8 +1160,7 @@ protected ExpressionNode binaryMessage(final MethodBuilder builder, eventualSend, getSource(coord), sendOperator); } - private ExpressionNode binaryOperand(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + private ExpressionNode binaryOperand(final MethodBuilder builder) throws ProgramDefinitionError { ExpressionNode operand = primary(builder); // a binary operand can receive unaryMessages @@ -1196,7 +1186,7 @@ private ExpressionNode binaryOperand(final MethodBuilder builder) protected ExpressionNode keywordMessage(final MethodBuilder builder, final ExpressionNode receiver, final boolean explicitRcvr, - final boolean eventualSend, final SourceSection sendOperator) throws ParseError, MixinDefinitionError { + final boolean eventualSend, final SourceSection sendOperator) throws ProgramDefinitionError { assert !(!explicitRcvr && eventualSend); SourceCoordinate coord = getCoordinate(); List arguments = new ArrayList(); @@ -1290,25 +1280,33 @@ protected ExpressionNode inlineControlStructureIfPossible( source); } else if (!VmSettings.DYNAMIC_METRICS && "to:do:".equals(msgStr) && arguments.get(2) instanceof LiteralNode) { - Local loopIdx = builder.addLocal("i:" + source.getCharIndex(), source); - ExpressionNode inlinedBody = ((LiteralNode) arguments.get(2)).inline(builder, loopIdx); - inlinedBody.markAsLoopBody(); - return IntToDoInlinedLiteralsNodeGen.create(inlinedBody, loopIdx.getSlot(), loopIdx.source, - arguments.get(2), source, arguments.get(0), arguments.get(1)); + try { + Local loopIdx = builder.addLocal("i:" + source.getCharIndex(), source); + ExpressionNode inlinedBody = ((LiteralNode) arguments.get(2)).inline(builder, loopIdx); + inlinedBody.markAsLoopBody(); + return IntToDoInlinedLiteralsNodeGen.create(inlinedBody, loopIdx.getSlot(), loopIdx.source, + arguments.get(2), source, arguments.get(0), arguments.get(1)); + } catch (MethodDefinitionError e) { + throw new RuntimeException(e); + } } else if (!VmSettings.DYNAMIC_METRICS && "downTo:do:".equals(msgStr) && arguments.get(2) instanceof LiteralNode) { - Local loopIdx = builder.addLocal("i:" + source.getCharIndex(), source); - ExpressionNode inlinedBody = ((LiteralNode) arguments.get(2)).inline(builder, loopIdx); - inlinedBody.markAsLoopBody(); - return IntDownToDoInlinedLiteralsNodeGen.create(inlinedBody, loopIdx.getSlot(), loopIdx.source, - arguments.get(2), source, arguments.get(0), arguments.get(1)); + try { + Local loopIdx = builder.addLocal("i:" + source.getCharIndex(), source); + ExpressionNode inlinedBody = ((LiteralNode) arguments.get(2)).inline(builder, loopIdx); + inlinedBody.markAsLoopBody(); + return IntDownToDoInlinedLiteralsNodeGen.create(inlinedBody, loopIdx.getSlot(), loopIdx.source, + arguments.get(2), source, arguments.get(0), arguments.get(1)); + } catch (MethodDefinitionError e) { + throw new RuntimeException(e); + } } } return null; } private ExpressionNode formula(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { ExpressionNode operand = binaryOperand(builder); SourceCoordinate coord = getCoordinate(); boolean evenutalSend = accept(EventualSend, KeywordTag.class); @@ -1322,7 +1320,7 @@ private ExpressionNode formula(final MethodBuilder builder) } private ExpressionNode nestedTerm(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + throws ProgramDefinitionError { expect(NewTerm, DelimiterOpeningTag.class); ExpressionNode exp = expression(builder); expect(EndTerm, DelimiterClosingTag.class); @@ -1440,8 +1438,7 @@ private String string() throws ParseError { return s; } - private ExpressionNode nestedBlock(final MethodBuilder builder) - throws ParseError, MixinDefinitionError { + private ExpressionNode nestedBlock(final MethodBuilder builder) throws ProgramDefinitionError { SourceCoordinate coord = getCoordinate(); expect(NewBlock, DelimiterOpeningTag.class); diff --git a/src/som/compiler/ProgramDefinitionError.java b/src/som/compiler/ProgramDefinitionError.java new file mode 100644 index 000000000..055d663ba --- /dev/null +++ b/src/som/compiler/ProgramDefinitionError.java @@ -0,0 +1,31 @@ +package som.compiler; + +import com.oracle.truffle.api.source.SourceSection; + +public abstract class ProgramDefinitionError extends Exception { + private static final long serialVersionUID = 318305400750674461L; + + public ProgramDefinitionError(final String message) { + super(message); + } + + public abstract static class SemanticDefinitionError extends ProgramDefinitionError { + private static final long serialVersionUID = -3374814429682547685L; + private final SourceSection source; + + protected SemanticDefinitionError(final String message, final SourceSection source) { + super(message); + this.source = source; + } + + public SourceSection getSourceSection() { + return source; + } + + @Override + public String toString() { + return source.getSource().getName() + ":" + source.getStartLine() + ":" + + source.getStartColumn() + ":error: " + getMessage(); + } + } +} diff --git a/src/som/compiler/SourcecodeCompiler.java b/src/som/compiler/SourcecodeCompiler.java index 106b454be..bfa006896 100644 --- a/src/som/compiler/SourcecodeCompiler.java +++ b/src/som/compiler/SourcecodeCompiler.java @@ -27,22 +27,20 @@ import com.oracle.truffle.api.source.Source; import som.VM; -import som.compiler.MixinBuilder.MixinDefinitionError; -import som.compiler.Parser.ParseError; import tools.SourceCoordinate; import tools.language.StructuralProbe; public class SourcecodeCompiler { public MixinDefinition compileModule(final Source source, - final StructuralProbe structuralProbe) throws ParseError, MixinDefinitionError { + final StructuralProbe structuralProbe) throws ProgramDefinitionError { Parser parser = new Parser( source.getReader(), source.getLength(), source, structuralProbe); return compile(parser, source); } protected final MixinDefinition compile(final Parser parser, - final Source source) throws ParseError, MixinDefinitionError { + final Source source) throws ProgramDefinitionError { SourceCoordinate coord = parser.getCoordinate(); MixinBuilder mxnBuilder = parser.moduleDeclaration(); MixinDefinition result = mxnBuilder.assemble(parser.getSource(coord)); diff --git a/src/som/interpreter/InlinerForLexicallyEmbeddedMethods.java b/src/som/interpreter/InlinerForLexicallyEmbeddedMethods.java index 7d1de4884..65c4f1457 100644 --- a/src/som/interpreter/InlinerForLexicallyEmbeddedMethods.java +++ b/src/som/interpreter/InlinerForLexicallyEmbeddedMethods.java @@ -1,6 +1,13 @@ package som.interpreter; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.NodeVisitor; +import com.oracle.truffle.api.source.SourceSection; + import som.compiler.MethodBuilder; +import som.compiler.MethodBuilder.MethodDefinitionError; import som.compiler.Variable.Local; import som.interpreter.LexicalScope.MethodScope; import som.interpreter.nodes.ExpressionNode; @@ -8,12 +15,6 @@ import som.interpreter.nodes.UninitializedVariableNode.UninitializedVariableReadNode; import som.interpreter.nodes.UninitializedVariableNode.UninitializedVariableWriteNode; -import com.oracle.truffle.api.frame.FrameSlot; -import com.oracle.truffle.api.nodes.Node; -import com.oracle.truffle.api.nodes.NodeUtil; -import com.oracle.truffle.api.nodes.NodeVisitor; -import com.oracle.truffle.api.source.SourceSection; - public class InlinerForLexicallyEmbeddedMethods implements NodeVisitor { @@ -48,8 +49,12 @@ public boolean visit(final Node node) { public UninitializedVariableReadNode getLocalRead(final Object slotIdentifier, final SourceSection source) { String inlinedId = getEmbeddedSlotId(slotIdentifier); - builder.addLocalIfAbsent(inlinedId, source); - return (UninitializedVariableReadNode) builder.getReadNode(inlinedId, source); + try { + builder.addLocalIfAbsent(inlinedId, source); + return (UninitializedVariableReadNode) builder.getReadNode(inlinedId, source); + } catch (MethodDefinitionError e) { + throw new RuntimeException(e); + } } private String getEmbeddedSlotId(final Object slotIdentifier) { @@ -62,7 +67,11 @@ public FrameSlot addLocalSlot(final Object orgSlotId, final SourceSection source) { String id = getEmbeddedSlotId(orgSlotId); assert builder.getEmbeddedLocal(id) == null; - return builder.addLocal(id, source).getSlot(); + try { + return builder.addLocal(id, source).getSlot(); + } catch (MethodDefinitionError e) { + throw new RuntimeException(e); + } } public FrameSlot getLocalSlot(final Object orgSlotId) { @@ -79,9 +88,13 @@ public UninitializedVariableWriteNode getLocalWrite(final Object slotIdentifier, final ExpressionNode valExp, final SourceSection source) { String inlinedId = getEmbeddedSlotId(slotIdentifier); - builder.addLocalIfAbsent(inlinedId, source); - return (UninitializedVariableWriteNode) builder.getWriteNode(inlinedId, - valExp, source); + try { + builder.addLocalIfAbsent(inlinedId, source); + return (UninitializedVariableWriteNode) builder.getWriteNode(inlinedId, + valExp, source); + } catch (MethodDefinitionError e) { + throw new RuntimeException(e); + } } public ExpressionNode getReplacementForLocalArgument(final int argumentIndex, diff --git a/src/som/interpreter/nodes/ArgumentReadNode.java b/src/som/interpreter/nodes/ArgumentReadNode.java index 0eaa166f5..4a0435baa 100644 --- a/src/som/interpreter/nodes/ArgumentReadNode.java +++ b/src/som/interpreter/nodes/ArgumentReadNode.java @@ -56,6 +56,8 @@ protected boolean isTaggedWith(final Class tag) { return true; } else if (tag == LocalArgRead.class) { return true; + } else if (tag == StatementTag.class) { + return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } @@ -97,8 +99,6 @@ public void replaceWithLexicallyEmbeddedNode( protected boolean isTaggedWith(final Class tag) { if (tag == KeywordTag.class) { return true; - } else if (tag == StatementTag.class) { - return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } @@ -167,6 +167,8 @@ protected boolean isTaggedWith(final Class tag) { return true; } else if (tag == LocalArgRead.class) { return true; + } else if (tag == StatementTag.class) { + return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } @@ -209,8 +211,6 @@ protected LocalArgumentReadNode createLocalNode() { protected boolean isTaggedWith(final Class tag) { if (tag == KeywordTag.class) { return true; - } else if (tag == StatementTag.class) { - return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } @@ -244,8 +244,6 @@ public boolean isClassSide() { protected boolean isTaggedWith(final Class tag) { if (tag == KeywordTag.class) { return true; - } else if (tag == StatementTag.class) { - return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } @@ -291,8 +289,6 @@ public boolean isClassSide() { protected boolean isTaggedWith(final Class tag) { if (tag == KeywordTag.class) { return true; - } else if (tag == StatementTag.class) { - return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } diff --git a/src/som/interpreter/nodes/LocalVariableNode.java b/src/som/interpreter/nodes/LocalVariableNode.java index cfd9c6d55..b785d7c13 100644 --- a/src/som/interpreter/nodes/LocalVariableNode.java +++ b/src/som/interpreter/nodes/LocalVariableNode.java @@ -7,6 +7,7 @@ import com.oracle.truffle.api.frame.FrameSlotKind; import com.oracle.truffle.api.frame.FrameSlotTypeException; import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag; import com.oracle.truffle.api.source.SourceSection; import som.compiler.Variable.Local; @@ -54,6 +55,8 @@ public final void replaceWithIndependentCopyForInlining(final SplitterForLexical protected boolean isTaggedWith(final Class tag) { if (tag == LocalVariableTag.class) { return true; + } else if (tag == StatementTag.class) { + return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } diff --git a/src/som/interpreter/nodes/MessageSendNode.java b/src/som/interpreter/nodes/MessageSendNode.java index bf819af79..f5927e7a4 100644 --- a/src/som/interpreter/nodes/MessageSendNode.java +++ b/src/som/interpreter/nodes/MessageSendNode.java @@ -6,7 +6,8 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrumentation.Instrumentable; -import com.oracle.truffle.api.instrumentation.StandardTags; +import com.oracle.truffle.api.instrumentation.StandardTags.CallTag; +import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeCost; @@ -78,7 +79,9 @@ protected AbstractMessageSendNode(final SourceSection source) { @Override protected boolean isTaggedWith(final Class tag) { - if (tag == StandardTags.CallTag.class) { + if (tag == CallTag.class) { + return true; + } else if (tag == StatementTag.class) { return true; } return super.isTaggedWith(tag); diff --git a/src/som/interpreter/nodes/NonLocalVariableNode.java b/src/som/interpreter/nodes/NonLocalVariableNode.java index c169497de..1d43fbdd3 100644 --- a/src/som/interpreter/nodes/NonLocalVariableNode.java +++ b/src/som/interpreter/nodes/NonLocalVariableNode.java @@ -8,6 +8,7 @@ import com.oracle.truffle.api.frame.FrameSlotKind; import com.oracle.truffle.api.frame.FrameSlotTypeException; import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag; import com.oracle.truffle.api.source.SourceSection; import som.interpreter.InlinerAdaptToEmbeddedOuterContext; @@ -44,6 +45,8 @@ public final void replaceWithCopyAdaptedToEmbeddedOuterContext( protected boolean isTaggedWith(final Class tag) { if (tag == LocalVariableTag.class) { return true; + } else if (tag == StatementTag.class) { + return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } diff --git a/src/som/interpreter/nodes/UninitializedVariableNode.java b/src/som/interpreter/nodes/UninitializedVariableNode.java index 1df2656d2..d6ba8956b 100644 --- a/src/som/interpreter/nodes/UninitializedVariableNode.java +++ b/src/som/interpreter/nodes/UninitializedVariableNode.java @@ -4,6 +4,7 @@ import com.oracle.truffle.api.frame.FrameSlot; import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag; import com.oracle.truffle.api.source.SourceSection; import som.compiler.Variable.Local; @@ -66,6 +67,8 @@ public UninitializedVariableReadNode(final UninitializedVariableReadNode node, protected boolean isTaggedWith(final Class tag) { if (tag == LocalVarRead.class) { return true; + } else if (tag == StatementTag.class) { + return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } @@ -149,6 +152,8 @@ public UninitializedVariableWriteNode(final UninitializedVariableWriteNode node, protected boolean isTaggedWith(final Class tag) { if (tag == LocalVarWrite.class) { return true; + } else if (tag == StatementTag.class) { + return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } diff --git a/src/som/interpreter/nodes/literals/LiteralNode.java b/src/som/interpreter/nodes/literals/LiteralNode.java index 64058f1f4..f815852d1 100644 --- a/src/som/interpreter/nodes/literals/LiteralNode.java +++ b/src/som/interpreter/nodes/literals/LiteralNode.java @@ -23,6 +23,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrumentation.Instrumentable; +import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag; import com.oracle.truffle.api.nodes.NodeCost; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.source.SourceSection; @@ -65,6 +66,8 @@ public ExpressionNode inline(final MethodBuilder builder, protected boolean isTaggedWith(final Class tag) { if (tag == LiteralTag.class) { return true; + } else if (tag == StatementTag.class) { + return isMarkedAsRootExpression(); } else { return super.isTaggedWith(tag); } diff --git a/src/som/vm/ObjectSystem.java b/src/som/vm/ObjectSystem.java index cbb70662e..73c209898 100644 --- a/src/som/vm/ObjectSystem.java +++ b/src/som/vm/ObjectSystem.java @@ -18,11 +18,10 @@ import som.VM; import som.VmSettings; import som.compiler.AccessModifier; -import som.compiler.MixinBuilder.MixinDefinitionError; import som.compiler.MixinBuilder.MixinDefinitionId; import som.compiler.MixinDefinition; import som.compiler.MixinDefinition.SlotDefinition; -import som.compiler.Parser.ParseError; +import som.compiler.ProgramDefinitionError; import som.compiler.SourcecodeCompiler; import som.interpreter.LexicalScope.MixinScope; import som.interpreter.SomLanguage; @@ -105,7 +104,7 @@ public MixinDefinition loadModule(final Source source) throws IOException { module = compiler.compileModule(source, structuralProbe); loadedModules.put(uri, module); return module; - } catch (ParseError | MixinDefinitionError e) { + } catch (ProgramDefinitionError e) { VM.errorExit(e.getMessage()); throw new IOException(e); } diff --git a/src/som/vmobjects/SArray.java b/src/som/vmobjects/SArray.java index 410dc1b72..ef8d2da5a 100644 --- a/src/som/vmobjects/SArray.java +++ b/src/som/vmobjects/SArray.java @@ -27,6 +27,7 @@ public SArray(final long length, final SClass clazz) { public SArray(final Object storage, final SClass clazz) { assert !(storage instanceof Long); + assert storage != null; this.storage = storage; this.clazz = clazz; } diff --git a/src/tools/debugger/WebDebugger.java b/src/tools/debugger/WebDebugger.java index 6412d6b07..7e1041091 100644 --- a/src/tools/debugger/WebDebugger.java +++ b/src/tools/debugger/WebDebugger.java @@ -1,6 +1,5 @@ package tools.debugger; -import java.lang.ref.WeakReference; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -70,7 +69,7 @@ public class WebDebugger extends TruffleInstrument implements SuspendedCallback private final Map> rootNodes = new HashMap<>(); private int nextActivityId = 0; - private final Map, Suspension> activityToSuspension = new HashMap<>(); + private final Map activityToSuspension = new HashMap<>(); private final Map idToSuspension = new HashMap<>(); public void useDebuggerProtocol(final boolean debuggerProtocol) { @@ -119,12 +118,11 @@ Suspension getSuspension(final int activityId) { private synchronized Suspension getSuspension(final Object activity) { Suspension suspension = activityToSuspension.get(activity); if (suspension == null) { - WeakReference ref = new WeakReference(activity); int id = nextActivityId; nextActivityId += 1; - suspension = new Suspension(ref, id); + suspension = new Suspension(activity, id); - activityToSuspension.put(ref, suspension); + activityToSuspension.put(activity, suspension); idToSuspension.put(id, suspension); } return suspension; diff --git a/src/tools/debugger/frontend/Suspension.java b/src/tools/debugger/frontend/Suspension.java index cdca95bde..008ddffeb 100644 --- a/src/tools/debugger/frontend/Suspension.java +++ b/src/tools/debugger/frontend/Suspension.java @@ -1,6 +1,5 @@ package tools.debugger.frontend; -import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.concurrent.ArrayBlockingQueue; @@ -25,13 +24,13 @@ */ public class Suspension { public final int activityId; - private final WeakReference activity; + private final Object activity; private final ArrayBlockingQueue tasks; private SuspendedEvent suspendedEvent; private ApplicationThreadStack stack; - public Suspension(final WeakReference activity, final int activityId) { + public Suspension(final Object activity, final int activityId) { this.activity = activity; this.activityId = activityId; this.tasks = new ArrayBlockingQueue<>(2); @@ -137,6 +136,6 @@ public void suspend() { } } - public Object getActivity() { return activity.get(); } + public Object getActivity() { return activity; } public synchronized SuspendedEvent getEvent() { return suspendedEvent; } } diff --git a/src/tools/debugger/message/StackTraceResponse.java b/src/tools/debugger/message/StackTraceResponse.java index e934ea444..4a25a83c5 100644 --- a/src/tools/debugger/message/StackTraceResponse.java +++ b/src/tools/debugger/message/StackTraceResponse.java @@ -65,13 +65,13 @@ public static StackTraceResponse create(final int startFrame, final int levels, final Suspension suspension, final int requestId) { ArrayList frames = suspension.getStackFrames(); - StackFrame[] arr = new StackFrame[Math.min(frames.size(), levels)]; - int skipFrames = suspension.isHaltPrimitive() ? Suspension.FRAMES_SKIPPED_FOR_HALT : 0; if (startFrame > skipFrames) { skipFrames = startFrame; } + StackFrame[] arr = new StackFrame[Math.min(frames.size(), levels) - skipFrames]; + for (int frameId = skipFrames; frameId < frames.size() && frameId < levels; frameId += 1) { StackFrame f = createFrame(suspension, frameId, frames.get(frameId)); arr[frameId - skipFrames] = f; diff --git a/src/tools/debugger/message/StoppedMessage.java b/src/tools/debugger/message/StoppedMessage.java index 52a2d321c..7b347e7fc 100644 --- a/src/tools/debugger/message/StoppedMessage.java +++ b/src/tools/debugger/message/StoppedMessage.java @@ -46,10 +46,14 @@ private enum ActivityType { } public static StoppedMessage create(final Suspension suspension) { - assert !suspension.getEvent().getBreakpoints().isEmpty() : "Need to support other reasons for suspension"; - Reason reason = Reason.breakpoint; + Reason reason; + if (suspension.getEvent().getBreakpoints().isEmpty()) { + reason = Reason.step; + } else { + reason = Reason.breakpoint; + } - assert suspension.getActivity() instanceof Actor; + assert suspension.getActivity() instanceof Actor : "TODO support threads"; return new StoppedMessage(reason, suspension.activityId, ActivityType.Actor, ""); // TODO: look into additional details that can be provided as text diff --git a/tests/som/tests/VMTests.java b/tests/som/tests/VMTests.java index 30dd8db3b..8b0036d23 100644 --- a/tests/som/tests/VMTests.java +++ b/tests/som/tests/VMTests.java @@ -3,7 +3,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.BeforeClass; @@ -23,7 +22,7 @@ public static void enableInstrumentation() { public void testProcessArgumentsNothing() { VMOptions opts = new VMOptions(new String[0]); assertEquals(opts.platformFile, VMOptions.STANDARD_PLATFORM_FILE); - assertNull(opts.args); + assertArrayEquals(opts.args, new String[0]); } @Test @@ -31,7 +30,7 @@ public void testProcessArgumentsWithPlatformFile() { VMOptions opts = new VMOptions( new String[] {"--platform", "foo.som"}); assertEquals(opts.platformFile, "foo.som"); - assertNull(opts.args); + assertArrayEquals(opts.args, new String[0]); } @Test @@ -39,7 +38,7 @@ public void testProcessArgumentsWithKernelFile() { VMOptions opts = new VMOptions( new String[] {"--kernel", "foo.som"}); assertEquals(opts.kernelFile, "foo.som"); - assertNull(opts.args); + assertArrayEquals(opts.args, new String[0]); } @Test @@ -64,7 +63,7 @@ public void testProfileFlag() { new String[] {"--profile"}); assertEquals(opts.platformFile, VMOptions.STANDARD_PLATFORM_FILE); assertTrue(opts.profilingEnabled); - assertNull(opts.args); + assertArrayEquals(opts.args, new String[0]); } @Test @@ -74,6 +73,6 @@ public void testDebugFlag() { assertEquals(opts.platformFile, VMOptions.STANDARD_PLATFORM_FILE); assertTrue(opts.debuggerEnabled); assertFalse(opts.profilingEnabled); - assertNull(opts.args); + assertArrayEquals(opts.args, new String[0]); } } diff --git a/tools/tests/dym/expected-results/Bounce/defined-classes.csv b/tools/tests/dym/expected-results/Bounce/defined-classes.csv index c9489a85a..9f07ad9ad 100644 --- a/tools/tests/dym/expected-results/Bounce/defined-classes.csv +++ b/tools/tests/dym/expected-results/Bounce/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 2 Array Kernel.som pos=16460 len=2225 1 Ball Bounce.som pos=1753 len=719 2 @@ -38,13 +38,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 2 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Bounce/general-stats.csv b/tools/tests/dym/expected-results/Bounce/general-stats.csv index f3bb6256c..7e4ca09bd 100644 --- a/tools/tests/dym/expected-results/Bounce/general-stats.csv +++ b/tools/tests/dym/expected-results/Bounce/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 26 Lines Loaded 2078 Lines Executed 182 -Lines With Statements 922 +Lines With Statements 838 diff --git a/tools/tests/dym/expected-results/Bounce/local-accesses.csv b/tools/tests/dym/expected-results/Bounce/local-accesses.csv index 2053528f2..ca33853ae 100644 --- a/tools/tests/dym/expected-results/Bounce/local-accesses.csv +++ b/tools/tests/dym/expected-results/Bounce/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Bounce.som pos=1089 len=43 read BounceSuite class 1 Bounce.som pos=1089 len=43 read ALL 1 Bounce.som pos=1104 len=8 read Platform 1 diff --git a/tools/tests/dym/expected-results/Bounce/method-callsites.csv b/tools/tests/dym/expected-results/Bounce/method-callsites.csv index 4e597a8ba..2ffa0c52c 100644 --- a/tools/tests/dym/expected-results/Bounce/method-callsites.csv +++ b/tools/tests/dym/expected-results/Bounce/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Bounce.som pos=1089 len=43 0 0 0 Bounce.som pos=1135 len=0 0 0 0 Bounce.som pos=1282 len=0 2 1 1 diff --git a/tools/tests/dym/expected-results/DeltaBlue/defined-classes.csv b/tools/tests/dym/expected-results/DeltaBlue/defined-classes.csv index af7440304..4e613286d 100644 --- a/tools/tests/dym/expected-results/DeltaBlue/defined-classes.csv +++ b/tools/tests/dym/expected-results/DeltaBlue/defined-classes.csv @@ -1,6 +1,6 @@ Class Name Source Section Methods Executed AbstractConstraint DeltaBlue.som pos=14713 len=4583 6 -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 4 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 0 @@ -41,15 +41,15 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Plan DeltaBlue.som pos=817 len=341 2 Planner DeltaBlue.som pos=1162 len=10714 11 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 ScaleConstraint DeltaBlue.som pos=23619 len=2445 5 Set Collections.som pos=1286 len=2340 0 diff --git a/tools/tests/dym/expected-results/DeltaBlue/general-stats.csv b/tools/tests/dym/expected-results/DeltaBlue/general-stats.csv index bc686b227..78cdefbb5 100644 --- a/tools/tests/dym/expected-results/DeltaBlue/general-stats.csv +++ b/tools/tests/dym/expected-results/DeltaBlue/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 35 Lines Loaded 2828 Lines Executed 526 -Lines With Statements 1231 +Lines With Statements 1155 diff --git a/tools/tests/dym/expected-results/DeltaBlue/local-accesses.csv b/tools/tests/dym/expected-results/DeltaBlue/local-accesses.csv index ab9913dc7..192076754 100644 --- a/tools/tests/dym/expected-results/DeltaBlue/local-accesses.csv +++ b/tools/tests/dym/expected-results/DeltaBlue/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/DeltaBlue/method-callsites.csv b/tools/tests/dym/expected-results/DeltaBlue/method-callsites.csv index 272a35be3..c0e1dabf5 100644 --- a/tools/tests/dym/expected-results/DeltaBlue/method-callsites.csv +++ b/tools/tests/dym/expected-results/DeltaBlue/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Collections.som pos=3886 len=9 2 1 1 diff --git a/tools/tests/dym/expected-results/Fannkuch/defined-classes.csv b/tools/tests/dym/expected-results/Fannkuch/defined-classes.csv index 13a6f8051..89c48d51e 100644 --- a/tools/tests/dym/expected-results/Fannkuch/defined-classes.csv +++ b/tools/tests/dym/expected-results/Fannkuch/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 2 Array Kernel.som pos=16460 len=2225 4 Benchmark Harness.som pos=1446 len=596 0 @@ -38,13 +38,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Fannkuch/general-stats.csv b/tools/tests/dym/expected-results/Fannkuch/general-stats.csv index 26da6fb2d..0ae25f5ca 100644 --- a/tools/tests/dym/expected-results/Fannkuch/general-stats.csv +++ b/tools/tests/dym/expected-results/Fannkuch/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 21 Lines Loaded 2122 Lines Executed 207 -Lines With Statements 942 +Lines With Statements 859 diff --git a/tools/tests/dym/expected-results/Fannkuch/local-accesses.csv b/tools/tests/dym/expected-results/Fannkuch/local-accesses.csv index 060788b80..bea3f0b86 100644 --- a/tools/tests/dym/expected-results/Fannkuch/local-accesses.csv +++ b/tools/tests/dym/expected-results/Fannkuch/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Fannkuch/method-callsites.csv b/tools/tests/dym/expected-results/Fannkuch/method-callsites.csv index cc772d32f..4132abfa2 100644 --- a/tools/tests/dym/expected-results/Fannkuch/method-callsites.csv +++ b/tools/tests/dym/expected-results/Fannkuch/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Fannkuch.som pos=1307 len=43 0 0 0 diff --git a/tools/tests/dym/expected-results/GraphSearch/defined-classes.csv b/tools/tests/dym/expected-results/GraphSearch/defined-classes.csv index eab316be2..7593ca32d 100644 --- a/tools/tests/dym/expected-results/GraphSearch/defined-classes.csv +++ b/tools/tests/dym/expected-results/GraphSearch/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 2 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 0 @@ -39,13 +39,13 @@ Node GraphSearch.som pos=4396 len=126 1 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/GraphSearch/general-stats.csv b/tools/tests/dym/expected-results/GraphSearch/general-stats.csv index 515f959b0..16c2364c6 100644 --- a/tools/tests/dym/expected-results/GraphSearch/general-stats.csv +++ b/tools/tests/dym/expected-results/GraphSearch/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 25 Lines Loaded 2152 Lines Executed 243 -Lines With Statements 982 +Lines With Statements 894 diff --git a/tools/tests/dym/expected-results/GraphSearch/local-accesses.csv b/tools/tests/dym/expected-results/GraphSearch/local-accesses.csv index ab9064e2a..6947740da 100644 --- a/tools/tests/dym/expected-results/GraphSearch/local-accesses.csv +++ b/tools/tests/dym/expected-results/GraphSearch/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/GraphSearch/method-callsites.csv b/tools/tests/dym/expected-results/GraphSearch/method-callsites.csv index ad8311c3a..fea2f4b3a 100644 --- a/tools/tests/dym/expected-results/GraphSearch/method-callsites.csv +++ b/tools/tests/dym/expected-results/GraphSearch/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 GraphSearch.som pos=23 len=43 0 0 0 diff --git a/tools/tests/dym/expected-results/Json/defined-classes.csv b/tools/tests/dym/expected-results/Json/defined-classes.csv index 526095a6f..c792bdad4 100644 --- a/tools/tests/dym/expected-results/Json/defined-classes.csv +++ b/tools/tests/dym/expected-results/Json/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 1 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 1 @@ -45,14 +45,14 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 ParseException Json.som pos=35745 len=285 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Json/general-stats.csv b/tools/tests/dym/expected-results/Json/general-stats.csv index 6d7671251..964135a8a 100644 --- a/tools/tests/dym/expected-results/Json/general-stats.csv +++ b/tools/tests/dym/expected-results/Json/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 39 Lines Loaded 2794 Lines Executed 364 -Lines With Statements 1273 +Lines With Statements 1176 diff --git a/tools/tests/dym/expected-results/Json/local-accesses.csv b/tools/tests/dym/expected-results/Json/local-accesses.csv index 55a5eff3c..1b83be3ca 100644 --- a/tools/tests/dym/expected-results/Json/local-accesses.csv +++ b/tools/tests/dym/expected-results/Json/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Json/method-callsites.csv b/tools/tests/dym/expected-results/Json/method-callsites.csv index a27508d28..f9c37f4ba 100644 --- a/tools/tests/dym/expected-results/Json/method-callsites.csv +++ b/tools/tests/dym/expected-results/Json/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/defined-classes.csv b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/defined-classes.csv index f1f790aab..ec628a766 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/defined-classes.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/defined-classes.csv @@ -1,6 +1,6 @@ Class Name Source Section Methods Executed AValue LanguageFeatures.som pos=10853 len=73 0 -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 1 @@ -53,15 +53,15 @@ ObjWithOneMutableField LanguageFeatures.som pos=12312 len=62 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 OuterConstLoop LanguageFeatures.som pos=1957 len=384 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 PolyMorphicBlocks LanguageFeatures.som pos=12770 len=920 0 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 Recurse LanguageFeatures.som pos=6250 len=375 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 ReturnEx LanguageFeatures.som pos=5632 len=88 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/general-stats.csv b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/general-stats.csv index 02d4b7195..e8585d1e5 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/general-stats.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 19 Lines Loaded 2558 Lines Executed 182 -Lines With Statements 1153 +Lines With Statements 1043 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/local-accesses.csv b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/local-accesses.csv index 3335257c1..242def5b2 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/local-accesses.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/method-callsites.csv b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/method-callsites.csv index 3fd9b8ed5..74bb1f64f 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/method-callsites.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Dispatch/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/defined-classes.csv b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/defined-classes.csv index 50f107ae6..b47612e37 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/defined-classes.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/defined-classes.csv @@ -1,6 +1,6 @@ Class Name Source Section Methods Executed AValue LanguageFeatures.som pos=10853 len=73 0 -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 1 @@ -53,15 +53,15 @@ ObjWithOneMutableField LanguageFeatures.som pos=12312 len=62 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 OuterConstLoop LanguageFeatures.som pos=1957 len=384 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 PolyMorphicBlocks LanguageFeatures.som pos=12770 len=920 0 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 Recurse LanguageFeatures.som pos=6250 len=375 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 ReturnEx LanguageFeatures.som pos=5632 len=88 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/general-stats.csv b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/general-stats.csv index ef07eefb8..f8fbe8615 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/general-stats.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 35 Lines Loaded 2558 Lines Executed 183 -Lines With Statements 1153 +Lines With Statements 1043 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/local-accesses.csv b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/local-accesses.csv index b167b052f..0bc418b0c 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/local-accesses.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/method-callsites.csv b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/method-callsites.csv index 859c28993..fe28a7b41 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/method-callsites.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Fibonacci/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/defined-classes.csv b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/defined-classes.csv index 47e41cf07..d8e78dc62 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/defined-classes.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/defined-classes.csv @@ -1,6 +1,6 @@ Class Name Source Section Methods Executed AValue LanguageFeatures.som pos=10853 len=73 0 -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 1 @@ -53,15 +53,15 @@ ObjWithOneMutableField LanguageFeatures.som pos=12312 len=62 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 OuterConstLoop LanguageFeatures.som pos=1957 len=384 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 PolyMorphicBlocks LanguageFeatures.som pos=12770 len=920 0 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 Recurse LanguageFeatures.som pos=6250 len=375 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 ReturnEx LanguageFeatures.som pos=5632 len=88 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/general-stats.csv b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/general-stats.csv index c3a0acaa2..ab666f816 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/general-stats.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 15 Lines Loaded 2558 Lines Executed 214 -Lines With Statements 1154 +Lines With Statements 1044 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/local-accesses.csv b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/local-accesses.csv index 26a145f84..f8b5bb2b3 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/local-accesses.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/method-callsites.csv b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/method-callsites.csv index 68b062f16..9b54dc625 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/method-callsites.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.FieldLoop/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/defined-classes.csv b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/defined-classes.csv index 118affb9f..495bf863f 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/defined-classes.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/defined-classes.csv @@ -1,6 +1,6 @@ Class Name Source Section Methods Executed AValue LanguageFeatures.som pos=10853 len=73 0 -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 1 @@ -53,15 +53,15 @@ ObjWithOneMutableField LanguageFeatures.som pos=12312 len=62 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 OuterConstLoop LanguageFeatures.som pos=1957 len=384 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 PolyMorphicBlocks LanguageFeatures.som pos=12770 len=920 0 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 Recurse LanguageFeatures.som pos=6250 len=375 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 ReturnEx LanguageFeatures.som pos=5632 len=88 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/general-stats.csv b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/general-stats.csv index f9f19017c..8ab81b91b 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/general-stats.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 17 Lines Loaded 2558 Lines Executed 182 -Lines With Statements 1153 +Lines With Statements 1043 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/local-accesses.csv b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/local-accesses.csv index 85376095b..caeb9c10a 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/local-accesses.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/method-callsites.csv b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/method-callsites.csv index f3cb88cb9..c77131463 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/method-callsites.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.IntegerLoop/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Loop/defined-classes.csv b/tools/tests/dym/expected-results/LanguageFeatures.Loop/defined-classes.csv index 22428ee71..2f570806e 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Loop/defined-classes.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Loop/defined-classes.csv @@ -1,6 +1,6 @@ Class Name Source Section Methods Executed AValue LanguageFeatures.som pos=10853 len=73 0 -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 1 @@ -53,15 +53,15 @@ ObjWithOneMutableField LanguageFeatures.som pos=12312 len=62 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 OuterConstLoop LanguageFeatures.som pos=1957 len=384 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 PolyMorphicBlocks LanguageFeatures.som pos=12770 len=920 0 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 Recurse LanguageFeatures.som pos=6250 len=375 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 ReturnEx LanguageFeatures.som pos=5632 len=88 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Loop/general-stats.csv b/tools/tests/dym/expected-results/LanguageFeatures.Loop/general-stats.csv index 1a6892d2c..eb88e84a2 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Loop/general-stats.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Loop/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 22 Lines Loaded 2558 Lines Executed 185 -Lines With Statements 1153 +Lines With Statements 1044 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Loop/local-accesses.csv b/tools/tests/dym/expected-results/LanguageFeatures.Loop/local-accesses.csv index 9bbb9ae32..0b067c996 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Loop/local-accesses.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Loop/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Loop/method-callsites.csv b/tools/tests/dym/expected-results/LanguageFeatures.Loop/method-callsites.csv index ceb2c7156..e0563b4f9 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Loop/method-callsites.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Loop/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/defined-classes.csv b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/defined-classes.csv index ea1ec1083..07abea3d6 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/defined-classes.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/defined-classes.csv @@ -1,6 +1,6 @@ Class Name Source Section Methods Executed AValue LanguageFeatures.som pos=10853 len=73 0 -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 1 @@ -53,15 +53,15 @@ ObjWithOneMutableField LanguageFeatures.som pos=12312 len=62 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 OuterConstLoop LanguageFeatures.som pos=1957 len=384 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 PolyMorphicBlocks LanguageFeatures.som pos=12770 len=920 0 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 Recurse LanguageFeatures.som pos=6250 len=375 3 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 ReturnEx LanguageFeatures.som pos=5632 len=88 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/general-stats.csv b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/general-stats.csv index f33501044..cec19805b 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/general-stats.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 29 Lines Loaded 2558 Lines Executed 181 -Lines With Statements 1153 +Lines With Statements 1043 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/local-accesses.csv b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/local-accesses.csv index 39d15406f..af4a56d99 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/local-accesses.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/method-callsites.csv b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/method-callsites.csv index 2699f42bf..7b6c0238b 100644 --- a/tools/tests/dym/expected-results/LanguageFeatures.Recurse/method-callsites.csv +++ b/tools/tests/dym/expected-results/LanguageFeatures.Recurse/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/List/defined-classes.csv b/tools/tests/dym/expected-results/List/defined-classes.csv index 1f589826e..9fc36522e 100644 --- a/tools/tests/dym/expected-results/List/defined-classes.csv +++ b/tools/tests/dym/expected-results/List/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 2 @@ -38,13 +38,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/List/general-stats.csv b/tools/tests/dym/expected-results/List/general-stats.csv index 216077fd9..00a120bf2 100644 --- a/tools/tests/dym/expected-results/List/general-stats.csv +++ b/tools/tests/dym/expected-results/List/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 33 Lines Loaded 2081 Lines Executed 170 -Lines With Statements 921 +Lines With Statements 837 diff --git a/tools/tests/dym/expected-results/List/local-accesses.csv b/tools/tests/dym/expected-results/List/local-accesses.csv index ce31c86d6..9212339d0 100644 --- a/tools/tests/dym/expected-results/List/local-accesses.csv +++ b/tools/tests/dym/expected-results/List/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/List/method-callsites.csv b/tools/tests/dym/expected-results/List/method-callsites.csv index ccc371e76..a26a6ab5b 100644 --- a/tools/tests/dym/expected-results/List/method-callsites.csv +++ b/tools/tests/dym/expected-results/List/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Mandelbrot/defined-classes.csv b/tools/tests/dym/expected-results/Mandelbrot/defined-classes.csv index d21fa8df0..d9970d0c2 100644 --- a/tools/tests/dym/expected-results/Mandelbrot/defined-classes.csv +++ b/tools/tests/dym/expected-results/Mandelbrot/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 0 @@ -37,13 +37,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Mandelbrot/general-stats.csv b/tools/tests/dym/expected-results/Mandelbrot/general-stats.csv index 85fadfc7f..f093a1341 100644 --- a/tools/tests/dym/expected-results/Mandelbrot/general-stats.csv +++ b/tools/tests/dym/expected-results/Mandelbrot/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 13 Lines Loaded 2133 Lines Executed 176 -Lines With Statements 936 +Lines With Statements 848 diff --git a/tools/tests/dym/expected-results/Mandelbrot/local-accesses.csv b/tools/tests/dym/expected-results/Mandelbrot/local-accesses.csv index 2c85df63b..ce4311ce6 100644 --- a/tools/tests/dym/expected-results/Mandelbrot/local-accesses.csv +++ b/tools/tests/dym/expected-results/Mandelbrot/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Mandelbrot/method-callsites.csv b/tools/tests/dym/expected-results/Mandelbrot/method-callsites.csv index 7ccf827fb..bf5127434 100644 --- a/tools/tests/dym/expected-results/Mandelbrot/method-callsites.csv +++ b/tools/tests/dym/expected-results/Mandelbrot/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/NBody/defined-classes.csv b/tools/tests/dym/expected-results/NBody/defined-classes.csv index 14f00a2e5..24beba16e 100644 --- a/tools/tests/dym/expected-results/NBody/defined-classes.csv +++ b/tools/tests/dym/expected-results/NBody/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 2 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 0 @@ -39,13 +39,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/NBody/general-stats.csv b/tools/tests/dym/expected-results/NBody/general-stats.csv index b3c00713a..2432bca4d 100644 --- a/tools/tests/dym/expected-results/NBody/general-stats.csv +++ b/tools/tests/dym/expected-results/NBody/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 22 Lines Loaded 2218 Lines Executed 254 -Lines With Statements 1014 +Lines With Statements 928 diff --git a/tools/tests/dym/expected-results/NBody/local-accesses.csv b/tools/tests/dym/expected-results/NBody/local-accesses.csv index bafa37648..0961b026e 100644 --- a/tools/tests/dym/expected-results/NBody/local-accesses.csv +++ b/tools/tests/dym/expected-results/NBody/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/NBody/method-callsites.csv b/tools/tests/dym/expected-results/NBody/method-callsites.csv index 50856eb6c..725bdd0a1 100644 --- a/tools/tests/dym/expected-results/NBody/method-callsites.csv +++ b/tools/tests/dym/expected-results/NBody/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Permute/defined-classes.csv b/tools/tests/dym/expected-results/Permute/defined-classes.csv index eaab27189..c87e26212 100644 --- a/tools/tests/dym/expected-results/Permute/defined-classes.csv +++ b/tools/tests/dym/expected-results/Permute/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 2 @@ -35,15 +35,15 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 PermuteSuite Permute.som pos=0 len=1969 2 Permute Permute.som pos=1233 len=632 4 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Permute/general-stats.csv b/tools/tests/dym/expected-results/Permute/general-stats.csv index 1151c8c14..ad21ac6cb 100644 --- a/tools/tests/dym/expected-results/Permute/general-stats.csv +++ b/tools/tests/dym/expected-results/Permute/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 40 Lines Loaded 2062 Lines Executed 165 -Lines With Statements 913 +Lines With Statements 829 diff --git a/tools/tests/dym/expected-results/Permute/local-accesses.csv b/tools/tests/dym/expected-results/Permute/local-accesses.csv index 54a2f6a6d..47b0bf7e0 100644 --- a/tools/tests/dym/expected-results/Permute/local-accesses.csv +++ b/tools/tests/dym/expected-results/Permute/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Permute/method-callsites.csv b/tools/tests/dym/expected-results/Permute/method-callsites.csv index cd39d47e1..6fc48bcf1 100644 --- a/tools/tests/dym/expected-results/Permute/method-callsites.csv +++ b/tools/tests/dym/expected-results/Permute/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Queens/defined-classes.csv b/tools/tests/dym/expected-results/Queens/defined-classes.csv index fde2040d6..cbfaa09cd 100644 --- a/tools/tests/dym/expected-results/Queens/defined-classes.csv +++ b/tools/tests/dym/expected-results/Queens/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 1 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 1 @@ -35,15 +35,15 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 QueensSuite Queens.som pos=0 len=2447 2 Queens Queens.som pos=1229 len=1117 6 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Queens/general-stats.csv b/tools/tests/dym/expected-results/Queens/general-stats.csv index 879ef7986..d8ba38bca 100644 --- a/tools/tests/dym/expected-results/Queens/general-stats.csv +++ b/tools/tests/dym/expected-results/Queens/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 52 Lines Loaded 2073 Lines Executed 170 -Lines With Statements 916 +Lines With Statements 831 diff --git a/tools/tests/dym/expected-results/Queens/local-accesses.csv b/tools/tests/dym/expected-results/Queens/local-accesses.csv index 4a9cf6e66..aba9d25d8 100644 --- a/tools/tests/dym/expected-results/Queens/local-accesses.csv +++ b/tools/tests/dym/expected-results/Queens/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Queens/method-callsites.csv b/tools/tests/dym/expected-results/Queens/method-callsites.csv index 2aabfe5ee..7e2281845 100644 --- a/tools/tests/dym/expected-results/Queens/method-callsites.csv +++ b/tools/tests/dym/expected-results/Queens/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Richards/defined-classes.csv b/tools/tests/dym/expected-results/Richards/defined-classes.csv index 27c3241dd..8c3256ded 100644 --- a/tools/tests/dym/expected-results/Richards/defined-classes.csv +++ b/tools/tests/dym/expected-results/Richards/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 1 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 1 @@ -39,14 +39,14 @@ NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 Packet Richards.som pos=10473 len=485 1 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 RBObject Richards.som pos=9402 len=328 1 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 RichardsBenchmark Richards.som pos=0 len=13913 2 RichardsBenchmarks Richards.som pos=717 len=8681 15 Richards Richards.som pos=551 len=160 2 diff --git a/tools/tests/dym/expected-results/Richards/general-stats.csv b/tools/tests/dym/expected-results/Richards/general-stats.csv index f49589761..30b3edee6 100644 --- a/tools/tests/dym/expected-results/Richards/general-stats.csv +++ b/tools/tests/dym/expected-results/Richards/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 27 Lines Loaded 2452 Lines Executed 416 -Lines With Statements 1191 +Lines With Statements 1100 diff --git a/tools/tests/dym/expected-results/Richards/local-accesses.csv b/tools/tests/dym/expected-results/Richards/local-accesses.csv index 383b0ff96..7fc1486f8 100644 --- a/tools/tests/dym/expected-results/Richards/local-accesses.csv +++ b/tools/tests/dym/expected-results/Richards/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Richards/method-callsites.csv b/tools/tests/dym/expected-results/Richards/method-callsites.csv index 5b8ea1c63..35de80fd6 100644 --- a/tools/tests/dym/expected-results/Richards/method-callsites.csv +++ b/tools/tests/dym/expected-results/Richards/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Sieve/defined-classes.csv b/tools/tests/dym/expected-results/Sieve/defined-classes.csv index 2a8800ec6..fdc983e1e 100644 --- a/tools/tests/dym/expected-results/Sieve/defined-classes.csv +++ b/tools/tests/dym/expected-results/Sieve/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 1 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 2 @@ -35,13 +35,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SieveSuite Sieve.som pos=0 len=1951 2 diff --git a/tools/tests/dym/expected-results/Sieve/general-stats.csv b/tools/tests/dym/expected-results/Sieve/general-stats.csv index 79be831b2..541c52b65 100644 --- a/tools/tests/dym/expected-results/Sieve/general-stats.csv +++ b/tools/tests/dym/expected-results/Sieve/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 22 Lines Loaded 2058 Lines Executed 161 -Lines With Statements 907 +Lines With Statements 823 diff --git a/tools/tests/dym/expected-results/Sieve/local-accesses.csv b/tools/tests/dym/expected-results/Sieve/local-accesses.csv index 753ecd43a..8cbe81051 100644 --- a/tools/tests/dym/expected-results/Sieve/local-accesses.csv +++ b/tools/tests/dym/expected-results/Sieve/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Sieve/method-callsites.csv b/tools/tests/dym/expected-results/Sieve/method-callsites.csv index 4192c8c2b..b61e46c75 100644 --- a/tools/tests/dym/expected-results/Sieve/method-callsites.csv +++ b/tools/tests/dym/expected-results/Sieve/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Sort.BubbleSort/defined-classes.csv b/tools/tests/dym/expected-results/Sort.BubbleSort/defined-classes.csv index 59da2831b..8359a056b 100644 --- a/tools/tests/dym/expected-results/Sort.BubbleSort/defined-classes.csv +++ b/tools/tests/dym/expected-results/Sort.BubbleSort/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 2 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 1 @@ -36,14 +36,14 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 QuickSort Sort.som pos=3049 len=959 0 Random Harness.som pos=2048 len=143 2 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Sort.BubbleSort/general-stats.csv b/tools/tests/dym/expected-results/Sort.BubbleSort/general-stats.csv index 797128475..e2e74c179 100644 --- a/tools/tests/dym/expected-results/Sort.BubbleSort/general-stats.csv +++ b/tools/tests/dym/expected-results/Sort.BubbleSort/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 25 Lines Loaded 2158 Lines Executed 213 -Lines With Statements 972 +Lines With Statements 884 diff --git a/tools/tests/dym/expected-results/Sort.BubbleSort/local-accesses.csv b/tools/tests/dym/expected-results/Sort.BubbleSort/local-accesses.csv index 57a55c981..f1aa0e3e7 100644 --- a/tools/tests/dym/expected-results/Sort.BubbleSort/local-accesses.csv +++ b/tools/tests/dym/expected-results/Sort.BubbleSort/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Sort.BubbleSort/method-callsites.csv b/tools/tests/dym/expected-results/Sort.BubbleSort/method-callsites.csv index f83ab8b72..000d443a4 100644 --- a/tools/tests/dym/expected-results/Sort.BubbleSort/method-callsites.csv +++ b/tools/tests/dym/expected-results/Sort.BubbleSort/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Sort.QuickSort/defined-classes.csv b/tools/tests/dym/expected-results/Sort.QuickSort/defined-classes.csv index b24b245ba..11933b535 100644 --- a/tools/tests/dym/expected-results/Sort.QuickSort/defined-classes.csv +++ b/tools/tests/dym/expected-results/Sort.QuickSort/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 2 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 1 @@ -36,14 +36,14 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 QuickSort Sort.som pos=3049 len=959 3 Random Harness.som pos=2048 len=143 2 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Sort.QuickSort/general-stats.csv b/tools/tests/dym/expected-results/Sort.QuickSort/general-stats.csv index 07a638aad..0a5180e7f 100644 --- a/tools/tests/dym/expected-results/Sort.QuickSort/general-stats.csv +++ b/tools/tests/dym/expected-results/Sort.QuickSort/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 40 Lines Loaded 2158 Lines Executed 218 -Lines With Statements 971 +Lines With Statements 885 diff --git a/tools/tests/dym/expected-results/Sort.QuickSort/local-accesses.csv b/tools/tests/dym/expected-results/Sort.QuickSort/local-accesses.csv index 05f95cdac..60ece3c01 100644 --- a/tools/tests/dym/expected-results/Sort.QuickSort/local-accesses.csv +++ b/tools/tests/dym/expected-results/Sort.QuickSort/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Sort.QuickSort/method-callsites.csv b/tools/tests/dym/expected-results/Sort.QuickSort/method-callsites.csv index a1c890f9f..a30115eff 100644 --- a/tools/tests/dym/expected-results/Sort.QuickSort/method-callsites.csv +++ b/tools/tests/dym/expected-results/Sort.QuickSort/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Sort.TreeSort/defined-classes.csv b/tools/tests/dym/expected-results/Sort.TreeSort/defined-classes.csv index ccefa43e0..bb47bf3fe 100644 --- a/tools/tests/dym/expected-results/Sort.TreeSort/defined-classes.csv +++ b/tools/tests/dym/expected-results/Sort.TreeSort/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 2 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 1 @@ -36,14 +36,14 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 2 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 QuickSort Sort.som pos=3049 len=959 0 Random Harness.som pos=2048 len=143 2 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Sort.TreeSort/general-stats.csv b/tools/tests/dym/expected-results/Sort.TreeSort/general-stats.csv index 57e253c1c..ab2d680cd 100644 --- a/tools/tests/dym/expected-results/Sort.TreeSort/general-stats.csv +++ b/tools/tests/dym/expected-results/Sort.TreeSort/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 45 Lines Loaded 2158 Lines Executed 213 -Lines With Statements 971 +Lines With Statements 882 diff --git a/tools/tests/dym/expected-results/Sort.TreeSort/local-accesses.csv b/tools/tests/dym/expected-results/Sort.TreeSort/local-accesses.csv index 4a643fdef..841ea631a 100644 --- a/tools/tests/dym/expected-results/Sort.TreeSort/local-accesses.csv +++ b/tools/tests/dym/expected-results/Sort.TreeSort/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Sort.TreeSort/method-callsites.csv b/tools/tests/dym/expected-results/Sort.TreeSort/method-callsites.csv index 76748e9aa..5e4d948c3 100644 --- a/tools/tests/dym/expected-results/Sort.TreeSort/method-callsites.csv +++ b/tools/tests/dym/expected-results/Sort.TreeSort/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Storage/defined-classes.csv b/tools/tests/dym/expected-results/Storage/defined-classes.csv index 626fb3ae3..6ec75a62b 100644 --- a/tools/tests/dym/expected-results/Storage/defined-classes.csv +++ b/tools/tests/dym/expected-results/Storage/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 1 Array Kernel.som pos=16460 len=2225 1 Benchmark Harness.som pos=1446 len=596 2 @@ -35,13 +35,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 2 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Storage/general-stats.csv b/tools/tests/dym/expected-results/Storage/general-stats.csv index 5a0a1a0a6..34c7ba24c 100644 --- a/tools/tests/dym/expected-results/Storage/general-stats.csv +++ b/tools/tests/dym/expected-results/Storage/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 71 Lines Loaded 2052 Lines Executed 162 -Lines With Statements 904 +Lines With Statements 820 diff --git a/tools/tests/dym/expected-results/Storage/local-accesses.csv b/tools/tests/dym/expected-results/Storage/local-accesses.csv index ebab59b80..a63dbc41d 100644 --- a/tools/tests/dym/expected-results/Storage/local-accesses.csv +++ b/tools/tests/dym/expected-results/Storage/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Storage/method-callsites.csv b/tools/tests/dym/expected-results/Storage/method-callsites.csv index 17ba8dcde..f21b48237 100644 --- a/tools/tests/dym/expected-results/Storage/method-callsites.csv +++ b/tools/tests/dym/expected-results/Storage/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0 diff --git a/tools/tests/dym/expected-results/Towers/defined-classes.csv b/tools/tests/dym/expected-results/Towers/defined-classes.csv index aa31c4a32..a8be600e9 100644 --- a/tools/tests/dym/expected-results/Towers/defined-classes.csv +++ b/tools/tests/dym/expected-results/Towers/defined-classes.csv @@ -1,5 +1,5 @@ Class Name Source Section Methods Executed -Actors Actors.som pos=0 len=8572 1 +Actors Actors.som pos=0 len=8552 1 ArrayReadMixin Kernel.som pos=14303 len=2151 0 Array Kernel.som pos=16460 len=2225 0 Benchmark Harness.som pos=1446 len=596 2 @@ -35,13 +35,13 @@ Nil Kernel.som pos=5299 len=417 0 NotAValue Kernel.som pos=28384 len=487 0 ObjectMirror Mirrors.som pos=3474 len=1030 0 Object Kernel.som pos=2915 len=155 0 -Pair Actors.som pos=3590 len=301 0 +Pair Actors.som pos=3570 len=301 0 Pair Kernel.som pos=20690 len=249 0 Platform Platform.som pos=0 len=1355 2 -PromiseGroup Actors.som pos=3895 len=1511 0 +PromiseGroup Actors.som pos=3875 len=1511 0 Promise Actors.som pos=2420 len=933 0 Random Harness.som pos=2048 len=143 0 -Resolver Actors.som pos=3357 len=229 0 +Resolver Actors.som pos=3357 len=209 0 Run Harness.som pos=3877 len=2253 8 Set Collections.som pos=1286 len=2340 0 SlotMirror Mirrors.som pos=4510 len=33 0 diff --git a/tools/tests/dym/expected-results/Towers/general-stats.csv b/tools/tests/dym/expected-results/Towers/general-stats.csv index 7408c328d..e7b1b7bf1 100644 --- a/tools/tests/dym/expected-results/Towers/general-stats.csv +++ b/tools/tests/dym/expected-results/Towers/general-stats.csv @@ -2,4 +2,4 @@ Statistic Value Max Stack Height 30 Lines Loaded 2096 Lines Executed 179 -Lines With Statements 929 +Lines With Statements 845 diff --git a/tools/tests/dym/expected-results/Towers/local-accesses.csv b/tools/tests/dym/expected-results/Towers/local-accesses.csv index ca73035d5..98d1ac0fa 100644 --- a/tools/tests/dym/expected-results/Towers/local-accesses.csv +++ b/tools/tests/dym/expected-results/Towers/local-accesses.csv @@ -49,8 +49,8 @@ Actors.som pos=2443 len=6 read Actors 1 Actors.som pos=2443 len=6 read ALL 1 Actors.som pos=3381 len=5 read Actors 1 Actors.som pos=3381 len=5 read ALL 1 -Actors.som pos=3631 len=0 read Actors 1 -Actors.som pos=3631 len=0 read ALL 1 +Actors.som pos=3611 len=0 read Actors 1 +Actors.som pos=3611 len=0 read ALL 1 Collections.som pos=1089 len=19 read Collections class 1 Collections.som pos=1089 len=19 read ALL 1 Collections.som pos=1102 len=6 read Kernel 1 diff --git a/tools/tests/dym/expected-results/Towers/method-callsites.csv b/tools/tests/dym/expected-results/Towers/method-callsites.csv index dc8c5c226..aff5deda4 100644 --- a/tools/tests/dym/expected-results/Towers/method-callsites.csv +++ b/tools/tests/dym/expected-results/Towers/method-callsites.csv @@ -4,7 +4,7 @@ Actors.som pos=1130 len=5 0 0 0 Actors.som pos=1617 len=5 0 0 0 Actors.som pos=2443 len=6 0 0 0 Actors.som pos=3381 len=5 0 0 0 -Actors.som pos=3631 len=0 0 0 0 +Actors.som pos=3611 len=0 0 0 0 Collections.som pos=1089 len=19 0 0 0 Collections.som pos=1111 len=5 0 0 0 Harness.som pos=1085 len=23 0 0 0