interp: fix reading from external global

This fixes https://github.com/tinygo-org/tinygo/issues/3020.
This commit is contained in:
Ayke van Laethem
2022-09-15 16:18:15 +02:00
committed by Ron Evans
parent 5f96d2b784
commit 9e4e182615
3 changed files with 9 additions and 0 deletions
+5
View File
@@ -369,6 +369,11 @@ func (r *runner) run(fn *function, params []value, parentMem *memoryView, indent
nBytes := uint32(operands[3].Uint())
dstObj := mem.getWritable(dst.index())
dstBuf := dstObj.buffer.asRawValue(r)
if mem.get(src.index()).buffer == nil {
// Looks like the source buffer is not defined.
// This can happen with //extern or //go:embed.
return nil, mem, r.errorAt(inst, errUnsupportedRuntimeInst)
}
srcBuf := mem.get(src.index()).buffer.asRawValue(r)
copy(dstBuf.buf[dst.offset():dst.offset()+nBytes], srcBuf.buf[src.offset():])
dstObj.buffer = dstBuf
+3
View File
@@ -20,9 +20,12 @@ var (
//go:embed a/b/.hidden
var hidden string
var helloStringBytes = []byte(helloString)
func main() {
println("string:", strings.TrimSpace(helloString))
println("bytes:", strings.TrimSpace(string(helloBytes)))
println("[]byte(string):", strings.TrimSpace(string(helloStringBytes)))
println("files:")
readFiles(".")
}
+1
View File
@@ -1,5 +1,6 @@
string: hello world!
bytes: hello world!
[]byte(string): hello world!
files:
- a
- a/b