Fix for #244

src/instrumenter/interpose.ts

@@ -24,6 +24,7 @@ import {
     PointerType,
     specializeType,
     StateVariableVisibility,
+    SuperType,
     TypeName,
     TypeNode,
     UserDefinedType,
@@ -403,37 +404,42 @@ export function interposeCall(
     const params: VariableDeclaration[] = [];
     const returns: VariableDeclaration[] = [];
 
-    let receiver: Expression;
+    let receiver: Expression | undefined;
     let callOriginalExp: Expression;
 
     const baseT = ctx.typeEnv.inference.typeOf(callee.vExpression);
 
     if (call.vFunctionCallType === ExternalReferenceType.UserDefined) {
-        assert(
-            baseT instanceof UserDefinedType && baseT.definition instanceof ContractDefinition,
-            "Expected base to be a reference to a contract, not {0}",
-            baseT
-        );
-
-        params.push(
-            factory.makeVariableDeclaration(
-                false,
-                false,
-                "receiver",
-                wrapper.id,
-                false,
-                DataLocation.Default,
-                StateVariableVisibility.Default,
-                Mutability.Mutable,
-                baseT.pp(),
-                undefined,
-                factory.makeUserDefinedTypeName(
-                    "<missing>",
-                    getFQName(baseT.definition, call),
-                    baseT.definition.id
+        if (baseT instanceof UserDefinedType && baseT.definition instanceof ContractDefinition) {
+            params.push(
+                factory.makeVariableDeclaration(
+                    false,
+                    false,
+                    "receiver",
+                    wrapper.id,
+                    false,
+                    DataLocation.Default,
+                    StateVariableVisibility.Default,
+                    Mutability.Mutable,
+                    baseT.pp(),
+                    undefined,
+                    factory.makeUserDefinedTypeName(
+                        "<missing>",
+                        getFQName(baseT.definition, call),
+                        baseT.definition.id
+                    )
                 )
-            )
-        );
+            );
+
+            receiver = factory.copy(callee.vExpression);
+            copySrc(callee.vExpression, receiver);
+        } else {
+            assert(
+                baseT instanceof SuperType,
+                "Expected base to be a reference to a contract or super, not {0}",
+                baseT
+            );
+        }
 
         params.push(
             ...calleeT.parameters.map((paramT, idx) => {
@@ -459,12 +465,11 @@ export function interposeCall(
             )
         );
 
-        receiver = factory.copy(callee.vExpression);
-        copySrc(callee.vExpression, receiver);
-
         callOriginalExp = factory.makeMemberAccess(
             call.vExpression.typeString,
-            factory.makeIdentifierFor(params[0]),
+            baseT instanceof SuperType
+                ? factory.makeIdentifier("<missing>", "super", -1)
+                : factory.makeIdentifierFor(params[0]),
             callee.memberName,
             callee.referencedDeclaration
         );
@@ -554,7 +559,7 @@ export function interposeCall(
         );
     }
 
-    let nImplicitArgs = 1;
+    let nImplicitArgs = baseT instanceof SuperType ? 0 : 1;
 
     /**
      * If the original call had gas/value function call options, we need
@@ -644,7 +649,8 @@ export function interposeCall(
 
     contract.appendChild(wrapper);
     call.vExpression = newCallee;
-    call.vArguments.unshift(receiver);
+
+    if (receiver) call.vArguments.unshift(receiver);
 
     // If the call is in a pure/view function change its mutability
     const containingFun = getScopeFun(call);

test/samples/hardhat_test.instrumented.sol

@@ -218,7 +218,7 @@ contract HardHatTest {
             }
             {
                 console.logString("HIT: 007987:0040:000 6: ");
-                if (!(__ScribbleUtilsLib__18.eq_encoded(abi.encode(str), "abc"))) {
+                if (!(__ScribbleUtilsLib__19.eq_encoded(abi.encode(str), "abc"))) {
                     console.logString("str");
                     console.logString(str);
                     console.logString("007987:0040:000 6: ");
@@ -227,7 +227,7 @@ contract HardHatTest {
             }
             {
                 console.logString("HIT: 008360:0040:000 7: ");
-                if (!(__ScribbleUtilsLib__18.eq_encoded(bts, hex"010203"))) {
+                if (!(__ScribbleUtilsLib__19.eq_encoded(bts, hex"010203"))) {
                     console.logString("bts");
                     console.logBytes(bts);
                     console.logString("008360:0040:000 7: ");
@@ -539,7 +539,7 @@ contract HardHatTest {
     function _original_HardHatTest_main(string memory str, bytes memory bts) private {}
 }
 
-library __ScribbleUtilsLib__18 {
+library __ScribbleUtilsLib__19 {
     function isInContract() internal returns (bool res) {
         assembly {
             res := sload(0x5f0b92cf9616afdee4f4136f66393f1343b027f01be893fa569eb2e2b667a40c)

test/samples/hardhat_test.sol

@@ -1,3 +1,4 @@
+pragma solidity 0.8.21;
 contract HardHatTest {
     uint8[] b = [1, 2, 3];
 

test/samples/immutables.instrumented.sol

@@ -1,6 +1,6 @@
 /// This file is auto-generated by Scribble and shouldn't be edited directly.
 /// Use --disarm prior to make any changes.
-pragma solidity 0.8.21;
+pragma solidity 0.8.20;
 
 /// #if_succeeds x == 5;
 contract Example01 {
@@ -10,7 +10,7 @@ contract Example01 {
         x = 5;
         unchecked {
             if (!(x == 5)) {
-                emit __ScribbleUtilsLib__55.AssertionFailed("000324:0066:000 0: ");
+                emit __ScribbleUtilsLib__56.AssertionFailed("000324:0066:000 0: ");
                 assert(false);
             }
         }
@@ -25,7 +25,7 @@ contract Example02 {
         x = 5;
         unchecked {
             if (!(x == 5)) {
-                emit __ScribbleUtilsLib__55.AssertionFailed("000637:0066:000 1: ");
+                emit __ScribbleUtilsLib__56.AssertionFailed("000637:0066:000 1: ");
                 assert(false);
             }
         }
@@ -58,7 +58,7 @@ contract Example04 {
     }
 }
 
-library __ScribbleUtilsLib__55 {
+library __ScribbleUtilsLib__56 {
     event AssertionFailed(string message);
 
     event AssertionFailedData(int eventId, bytes encodingData);

test/samples/immutables.sol

@@ -1,3 +1,4 @@
+pragma solidity 0.8.20;
 /// #if_succeeds x == 5;
 contract Example01 {
     uint private immutable x;