Skip to content

Commit

Permalink
Revert "[interp] Rework the allocation of offsets for variables (dotn…
Browse files Browse the repository at this point in the history
…et#49072)"

This reverts commit 686f752.

Reverting this for now, as a workaround to get the AOT library tests
working again.

Running library tests with AOT+EnableAggressiveTrimming broke with:

```
  info: Arguments: --run,WasmTestRunner.dll,System.Buffers.Tests.dll,-notrait,category=OuterLoop,-notrait,category=failing
  info: Initializing.....
  fail: System.AggregateException: AggregateException_ctor_DefaultMessage (Arg_NullReferenceException)
         ---> System.NullReferenceException: Arg_NullReferenceException
           at Xunit.Sdk.ReflectionAttributeInfo.GetNamedArgument[Int32](String argumentName)
        --- End of stack trace from previous location ---
           at Xunit.Sdk.ReflectionAttributeInfo.GetNamedArgument[Int32](String argumentName)
        --- End of stack trace from previous location ---
           at Xunit.Sdk.ReflectionAttributeInfo.GetNamedArgument[Int32](String argumentName)
           Exception_EndOfInnerExceptionStack
  info: Discovering: System.Buffers.Tests.dll (method display = ClassAndMethod, method display options = None)
  info: WASM EXIT 1
  fail: Application has finished with exit code TESTS_FAILED but 0 was expected
```

More info: dotnet#49770
  • Loading branch information
radical committed Mar 17, 2021
1 parent 2d0fe49 commit 067dff2
Show file tree
Hide file tree
Showing 7 changed files with 487 additions and 1,094 deletions.
5 changes: 4 additions & 1 deletion src/mono/mono/mini/interp/interp-internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,10 @@ struct InterpMethod {
MonoType **param_types;
MonoJitInfo *jinfo;

guint32 locals_size;
// This doesn't include the size of stack locals
guint32 total_locals_size;
// The size of locals that map to the execution stack
guint32 stack_size;
guint32 alloca_size;
int num_clauses; // clauses
int transformed; // boolean
Expand Down
Loading

0 comments on commit 067dff2

Please sign in to comment.