see AssemblyScript#891

dcodeIO · dcodeIO · commit c1476e701066 · 2019-10-10T07:55:34.000+02:00
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -1491,6 +1491,7 @@ export class Compiler extends DiagnosticEmitter {
   /** Ensures that the specified string exists in static memory and returns a pointer to it. */
   ensureStaticString(stringValue: string): ExpressionRef {
     var program = this.program;
+    var module = this.module;
     var rtHeaderSize = program.runtimeHeaderSize;
     var stringInstance = assert(program.stringInstance);
     var stringSegment: MemorySegment;
@@ -1509,12 +1510,14 @@ export class Compiler extends DiagnosticEmitter {
     }
     var ref = i64_add(stringSegment.offset, i64_new(rtHeaderSize));
     this.currentType = stringInstance.type;
+    var ptr: ExpressionRef;
     if (this.options.isWasm64) {
-      return this.module.i64(i64_low(ref), i64_high(ref));
+      ptr = module.i64(i64_low(ref), i64_high(ref));
     } else {
       assert(i64_is_u32(ref));
-      return this.module.i32(i64_low(ref));
+      ptr = module.i32(i64_low(ref));
     }
+    return module.relocMem(ptr);
   }
 
   ensureStaticArrayBuffer(elementType: Type, values: ExpressionRef[]): MemorySegment {
@@ -7606,9 +7609,14 @@ export class Compiler extends DiagnosticEmitter {
         let arraySegment = this.ensureStaticArrayHeader(elementType, bufferSegment);
         let arrayAddress = i64_add(arraySegment.offset, i64_new(runtimeHeaderSize));
         this.currentType = arrayType;
-        return program.options.isWasm64
-          ? this.module.i64(i64_low(arrayAddress), i64_high(arrayAddress))
-          : this.module.i32(i64_low(arrayAddress));
+        let ptr: ExpressionRef;
+        if (program.options.isWasm64) {
+          ptr = module.i64(i64_low(arrayAddress), i64_high(arrayAddress));
+        } else {
+          assert(i64_is_u32(arrayAddress));
+          ptr = module.i32(i64_low(arrayAddress));
+        }
+        return module.relocMem(ptr);
 
       // otherwise allocate a new array header and make it wrap a copy of the static buffer
       } else {
diff --git a/src/module.ts b/src/module.ts
@@ -472,7 +472,7 @@ export class Module {
     this.tbase = globalName ? this.allocStringCached(globalName) : 0;
   }
 
-  private relocMem(ptr: ExpressionRef): ExpressionRef {
+  relocMem(ptr: ExpressionRef): ExpressionRef {
     var mbase = this.mbase;
     if (!mbase) return ptr;
     var ref = this.ref;
@@ -483,7 +483,7 @@ export class Module {
     }
   }
 
-  private relocTbl(idx: ExpressionRef): ExpressionRef {
+  relocTbl(idx: ExpressionRef): ExpressionRef {
     var tbase = this.tbase;
     if (!tbase) return idx;
     var ref = this.ref;
diff --git a/tests/compiler/relocatable.js b/tests/compiler/relocatable.js
@@ -1,9 +1,7 @@
 exports.preInstantiate = function(imports, exports) {
   // compiler generates initial = 1 because it doesn't know the imported value
   // of env.memory_base yet, hence we need to import a suitable memory as well:
-  imports["env"] = {
-    "memory": new WebAssembly.Memory({ initial: 2 }),
-    "memory_base": 65536,
-    "table_base": 100
-  };
+  imports["env"]["memory"] = new WebAssembly.Memory({ initial: 2 });
+  imports["env"]["memory_base"] = 65536;
+  imports["env"]["table_base"] = 100;
 };
diff --git a/tests/compiler/relocatable.ts b/tests/compiler/relocatable.ts
@@ -1,3 +1,11 @@
-const someStaticStuff: i32[] = [0];
+const staticString = "42";
+const staticArray: i32[] = [42];
 
-someStaticStuff;
+@external("env", "memory_base")
+declare const __memory_base: usize;
+
+assert(changetype<usize>(staticString) > __memory_base);
+assert(changetype<usize>(staticArray) > __memory_base);
+
+assert(staticString == "42");
+// assert(staticArray[0] == 42);

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ export class Module {`
`472`	`472`	`this.tbase = globalName ? this.allocStringCached(globalName) : 0;`
`473`	`473`	`}`
`474`	`474`
`475`		`- private relocMem(ptr: ExpressionRef): ExpressionRef {`
	`475`	`+ relocMem(ptr: ExpressionRef): ExpressionRef {`
`476`	`476`	`var mbase = this.mbase;`
`477`	`477`	`if (!mbase) return ptr;`
`478`	`478`	`var ref = this.ref;`
`@@ -483,7 +483,7 @@ export class Module {`
`483`	`483`	`}`
`484`	`484`	`}`
`485`	`485`
`486`		`- private relocTbl(idx: ExpressionRef): ExpressionRef {`
	`486`	`+ relocTbl(idx: ExpressionRef): ExpressionRef {`
`487`	`487`	`var tbase = this.tbase;`
`488`	`488`	`if (!tbase) return idx;`
`489`	`489`	`var ref = this.ref;`