[Compiler] Fix compiling inherited code from same contract

[SupunS]

Work towards #3804

Description

Problem

Compiling inherited code (e.g: pre/post condition) always treated contract variables as references (i.e: Foo in an expression Foo.hello(), where Foo is a contract). This was correct if the contract Foo is an import.

However, this wasn't correct for scenarios where the inherited code refers to the same contract, and those should not be treat as references.

Fix

Treat the contract variable as a reference only if it's an imported contract. Otherwise (it's the enclosing contract of the current code) treat it as the concrete type.

---

• Targeted PR against master branch
• Linked to Github issue with discussion and accepted design OR link to spec that describes this work
• Code follows the standards mentioned here
• Updated relevant documentation
• Re-reviewed Files changed in the Github PR explorer
• Added appropriate labels

[github-actions]

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

[github-actions]

Benchstat comparison

• Base branch: onflow:master
• Base commit: 0fb572e

Results

	old.txt	new.txt
	time/op		delta
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ByteArrayTransfer-4	1.62µs ± 0%	1.58µs ± 0%	~	(p=1.000 n=1+1)
ByteArrayValueToByteSlice-4	85.2ns ± 0%	79.1ns ± 0%	~	(p=1.000 n=1+1)
ByteSliceToByteArrayValue-4	1.40µs ± 0%	1.37µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/compiler goos:linux goarch:amd64
CompileFungibleTokenTransferTransaction-4	116µs ± 0%	118µs ± 0%	~	(p=1.000 n=1+1)
CompileTime-4	31.1µs ± 0%	29.6µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
ContractFunctionInvocation-4	369µs ± 0%	351µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
ContractImport-4	219µs ± 0%	222µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
EMVAddressTransfer-4	4.18µs ± 0%	4.52µs ± 0%	~	(p=1.000 n=1+1)
Emit-4	5.12ms ± 0%	5.06ms ± 0%	~	(p=1.000 n=1+1)
EnumTransfer-4	1.69µs ± 0%	1.61µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
ExportType/composite_type-4	239ns ± 0%	222ns ± 0%	~	(p=1.000 n=1+1)
ExportType/simple_type-4	41.2ns ± 0%	41.3ns ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
FTTransfer-4	150µs ± 0%	148µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ImperativeFib-4	22.7µs ± 0%	23.0µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
ImperativeFib-4	26.5µs ± 0%	27.5µs ± 0%	~	(p=1.000 n=1+1)
ImperativeFibNewCompilerNewVM-4	51.3µs ± 0%	50.2µs ± 0%	~	(p=1.000 n=1+1)
ImperativeFibNewVM-4	29.3µs ± 0%	29.0µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
InterpretRecursionFib-4	2.14ms ± 0%	2.16ms ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
InterpreterFTTransfer-4	121µs ± 0%	116µs ± 0%	~	(p=1.000 n=1+1)
InterpreterImperativeFib-4	21.3µs ± 0%	23.1µs ± 0%	~	(p=1.000 n=1+1)
InterpreterNewStruct-4	71.9µs ± 0%	71.2µs ± 0%	~	(p=1.000 n=1+1)
MethodCall/concrete_type_method_call-4	46.2µs ± 0%	47.8µs ± 0%	~	(p=1.000 n=1+1)
MethodCall/interface_method_call-4	62.8µs ± 0%	64.5µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
NewInterpreter/new_interpreter-4	882ns ± 0%	881ns ± 0%	~	(p=1.000 n=1+1)
NewInterpreter/new_sub-interpreter-4	322ns ± 0%	320ns ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
NewStruct-4	54.3µs ± 0%	51.1µs ± 0%	~	(p=1.000 n=1+1)
NewStructRaw-4	3.93µs ± 0%	3.78µs ± 0%	~	(p=1.000 n=1+1)
RecursionFib-4	1.61ms ± 0%	1.71ms ± 0%	~	(p=1.000 n=1+1)
RuntimeFungibleTokenTransfer-4	776µs ± 0%	748µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
RuntimeFungibleTokenTransferInterpreter-4	642µs ± 0%	661µs ± 0%	~	(p=1.000 n=1+1)
RuntimeResourceDictionaryValues-4	2.85ms ± 0%	2.60ms ± 0%	~	(p=1.000 n=1+1)
RuntimeResourceTracking-4	11.4ms ± 0%	10.1ms ± 0%	~	(p=1.000 n=1+1)
RuntimeScriptNoop-4	14.9µs ± 0%	14.6µs ± 0%	~	(p=1.000 n=1+1)
RuntimeVMInvokeContractImperativeFib-4	41.6µs ± 0%	42.9µs ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ValueIsSubtypeOfSemaType-4	58.8ns ± 0%	58.6ns ± 0%	~	(p=1.000 n=1+1)
	alloc/op		delta
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ByteArrayTransfer-4	1.15kB ± 0%	1.17kB ± 0%	~	(p=1.000 n=1+1)
ByteArrayValueToByteSlice-4	32.0B ± 0%	32.0B ± 0%	~	(all equal)
ByteSliceToByteArrayValue-4	943B ± 0%	961B ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/compiler goos:linux goarch:amd64
CompileFungibleTokenTransferTransaction-4	83.4kB ± 0%	83.5kB ± 0%	~	(p=1.000 n=1+1)
CompileTime-4	17.2kB ± 0%	17.2kB ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
ContractFunctionInvocation-4	149kB ± 0%	149kB ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
ContractImport-4	79.9kB ± 0%	79.9kB ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
EMVAddressTransfer-4	2.77kB ± 0%	2.84kB ± 0%	~	(p=1.000 n=1+1)
Emit-4	1.70MB ± 0%	1.70MB ± 0%	~	(p=1.000 n=1+1)
EnumTransfer-4	992B ± 0%	984B ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
ExportType/composite_type-4	112B ± 0%	112B ± 0%	~	(all equal)
ExportType/simple_type-4	0.00B	0.00B	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
FTTransfer-4	46.8kB ± 0%	46.8kB ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ImperativeFib-4	8.30kB ± 0%	8.30kB ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
ImperativeFib-4	6.30kB ± 0%	6.30kB ± 0%	~	(all equal)
ImperativeFibNewCompilerNewVM-4	27.0kB ± 0%	27.0kB ± 0%	~	(all equal)
ImperativeFibNewVM-4	9.03kB ± 0%	9.03kB ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
InterpretRecursionFib-4	1.17MB ± 0%	1.17MB ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
InterpreterFTTransfer-4	46.2kB ± 0%	46.2kB ± 0%	~	(p=1.000 n=1+1)
InterpreterImperativeFib-4	8.29kB ± 0%	8.29kB ± 0%	~	(all equal)
InterpreterNewStruct-4	26.1kB ± 0%	26.2kB ± 0%	~	(p=1.000 n=1+1)
MethodCall/concrete_type_method_call-4	11.4kB ± 0%	11.4kB ± 0%	~	(p=1.000 n=1+1)
MethodCall/interface_method_call-4	18.3kB ± 0%	18.3kB ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
NewInterpreter/new_interpreter-4	1.02kB ± 0%	1.02kB ± 0%	~	(all equal)
NewInterpreter/new_sub-interpreter-4	232B ± 0%	232B ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
NewStruct-4	15.6kB ± 0%	15.8kB ± 0%	~	(p=1.000 n=1+1)
NewStructRaw-4	1.98kB ± 0%	1.95kB ± 0%	~	(p=1.000 n=1+1)
RecursionFib-4	342kB ± 0%	342kB ± 0%	~	(all equal)
RuntimeFungibleTokenTransfer-4	252kB ± 0%	251kB ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
RuntimeFungibleTokenTransferInterpreter-4	174kB ± 0%	175kB ± 0%	~	(p=1.000 n=1+1)
RuntimeResourceDictionaryValues-4	1.81MB ± 0%	1.80MB ± 0%	~	(p=1.000 n=1+1)
RuntimeResourceTracking-4	7.42MB ± 0%	7.50MB ± 0%	~	(p=1.000 n=1+1)
RuntimeScriptNoop-4	8.18kB ± 0%	8.17kB ± 0%	~	(p=1.000 n=1+1)
RuntimeVMInvokeContractImperativeFib-4	15.0kB ± 0%	15.0kB ± 0%	~	(p=1.000 n=1+1)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ValueIsSubtypeOfSemaType-4	32.0B ± 0%	32.0B ± 0%	~	(all equal)
	allocs/op		delta
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ByteArrayTransfer-4	8.00 ± 0%	8.00 ± 0%	~	(all equal)
ByteArrayValueToByteSlice-4	1.00 ± 0%	1.00 ± 0%	~	(all equal)
ByteSliceToByteArrayValue-4	6.00 ± 0%	6.00 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/bbq/compiler goos:linux goarch:amd64
CompileFungibleTokenTransferTransaction-4	581 ± 0%	581 ± 0%	~	(all equal)
CompileTime-4	212 ± 0%	212 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
ContractFunctionInvocation-4	2.28k ± 0%	2.28k ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
ContractImport-4	1.40k ± 0%	1.40k ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
EMVAddressTransfer-4	31.0 ± 0%	31.0 ± 0%	~	(all equal)
Emit-4	42.0k ± 0%	42.0k ± 0%	~	(p=1.000 n=1+1)
EnumTransfer-4	14.0 ± 0%	14.0 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
ExportType/composite_type-4	2.00 ± 0%	2.00 ± 0%	~	(all equal)
ExportType/simple_type-4	0.00	0.00	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
FTTransfer-4	1.49k ± 0%	1.49k ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ImperativeFib-4	176 ± 0%	176 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
ImperativeFib-4	322 ± 0%	322 ± 0%	~	(all equal)
ImperativeFibNewCompilerNewVM-4	534 ± 0%	534 ± 0%	~	(all equal)
ImperativeFibNewVM-4	365 ± 0%	365 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
InterpretRecursionFib-4	16.5k ± 0%	16.5k ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
InterpreterFTTransfer-4	1.01k ± 0%	1.01k ± 0%	~	(p=1.000 n=1+1)
InterpreterImperativeFib-4	175 ± 0%	175 ± 0%	~	(all equal)
InterpreterNewStruct-4	418 ± 0%	418 ± 0%	~	(all equal)
MethodCall/concrete_type_method_call-4	404 ± 0%	404 ± 0%	~	(all equal)
MethodCall/interface_method_call-4	514 ± 0%	514 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
NewInterpreter/new_interpreter-4	16.0 ± 0%	16.0 ± 0%	~	(all equal)
NewInterpreter/new_sub-interpreter-4	4.00 ± 0%	4.00 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/bbq/vm/test goos:linux goarch:amd64
NewStruct-4	432 ± 0%	432 ± 0%	~	(all equal)
NewStructRaw-4	32.0 ± 0%	32.0 ± 0%	~	(all equal)
RecursionFib-4	19.5k ± 0%	19.5k ± 0%	~	(all equal)
RuntimeFungibleTokenTransfer-4	4.22k ± 0%	4.22k ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/runtime goos:linux goarch:amd64
RuntimeFungibleTokenTransferInterpreter-4	3.22k ± 0%	3.22k ± 0%	~	(all equal)
RuntimeResourceDictionaryValues-4	36.7k ± 0%	36.7k ± 0%	~	(p=1.000 n=1+1)
RuntimeResourceTracking-4	131k ± 0%	131k ± 0%	~	(p=1.000 n=1+1)
RuntimeScriptNoop-4	117 ± 0%	117 ± 0%	~	(all equal)
RuntimeVMInvokeContractImperativeFib-4	489 ± 0%	489 ± 0%	~	(all equal)
pkg:github.com/onflow/cadence/interpreter goos:linux goarch:amd64
ValueIsSubtypeOfSemaType-4	1.00 ± 0%	1.00 ± 0%	~	(all equal)

[turbolent]

Good catch!