Use TVarArgList in vararg intrinsic signatures

Author: cirras

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Support for `AtomicCmpExchange128` intrinsic.
 
+### Changed
+
+- Improve `VarArg*` intrinsic signatures and make them stricter.
+
 ### Fixed
 
 - The `IsManagedType` intrinsic would only accept type references - it now accepts values.

delphi-checks-testkit/src/main/java/au/com/integradev/delphi/checks/verifier/CheckVerifierImpl.java

@@ -790,6 +790,9 @@ private Path createStandardLibrary() {
               + "  TCustomAttribute = class(TObject)\n"
               + "  end;\n"
               + "\n"
+              + "  TVarArgList = record\n"
+              + "  end;\n"
+              + "\n"
               + "implementation\n"
               + "\n"
               + "end.");

delphi-frontend/src/main/java/au/com/integradev/delphi/type/intrinsic/IntrinsicsInjector.java

@@ -352,13 +352,13 @@ private void buildRoutines() {
         .param(ANY_STRING)
         .varParam(TypeFactory.untypedType())
         .varParam(ANY_32_BIT_INTEGER);
-    routine("VarArgStart").varParam(TypeFactory.untypedType());
+    routine("VarArgStart").varParam(systemType("TVarArgList"));
     routine("VarArgGetValue")
-        .varParam(TypeFactory.untypedType())
+        .varParam(systemType("TVarArgList"))
         .param(ANY_CLASS_REFERENCE)
         .returns(IntrinsicReturnType.classReferenceValue(1));
-    routine("VarArgCopy").varParam(TypeFactory.untypedType()).varParam(TypeFactory.untypedType());
-    routine("VarArgEnd").varParam(TypeFactory.untypedType());
+    routine("VarArgCopy").varParam(systemType("TVarArgList")).varParam(systemType("TVarArgList"));
+    routine("VarArgEnd").varParam(systemType("TVarArgList"));
     routine("VarArrayRedim").varParam(ANY_VARIANT).param(type(INTEGER));
     routine("VarCast").varParam(ANY_VARIANT).param(ANY_VARIANT).param(type(INTEGER));
     routine("VarClear").varParam(ANY_VARIANT);

delphi-frontend/src/test/java/au/com/integradev/delphi/executor/DelphiSymbolTableExecutorTest.java

@@ -597,6 +597,14 @@ void testDefaultIntrinsic() {
     verifyUsages(22, 10, reference(32, 2));
   }
 
+  @Test
+  void testVarArgIntrinsics() {
+    execute("intrinsics/VarArgIntrinsics.pas");
+    verifyUsages(7, 10, reference(21, 4));
+    verifyUsages(14, 2, reference(17, 14), reference(18, 13), reference(21, 24), reference(24, 12));
+    verifyUsages(15, 2, reference(18, 21));
+  }
+
   @Test
   void testBinaryOperatorIntrinsics() {
     execute("operators/BinaryOperatorIntrinsics.pas");
@@ -1632,6 +1640,8 @@ private static Path createStandardLibrary(Path baseDir) {
               + "  end;\n"
               + "  TCustomAttribute = class(TObject)\n"
               + "  end;\n"
+              + "  TVarArgList = record\n"
+              + "  end;\n"
               + "implementation\n"
               + "end.");
 

delphi-frontend/src/test/resources/au/com/integradev/delphi/symbol/intrinsics/VarArgIntrinsics.pas

@@ -0,0 +1,27 @@
+unit VarArgIntrinsics;
+
+interface
+
+implementation
+
+procedure Proc(Arg: Integer);
+begin
+  // do nothing
+end;
+
+procedure Test; cdecl; varargs;
+var
+  VAList: TVarArgList;
+  Copy: TVarArgList;
+begin
+  VarArgStart(VAList);
+  VarArgCopy(VAList, Copy);
+
+  for var I := 0 to 3 do begin
+    Proc(VarArgGetValue(VAList, Integer));
+  end;
+
+  VarArgEnd(VAList);
+end;
+
+end.