[PATCH] D37898: [TargetLowering] Correctly track NumFixedArgs field of CallLoweringInfo

[Alex Bradbury via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL315457: [TargetLowering] Correctly track NumFixedArgs field of CallLoweringInfo (authored by asb).

Changed prior to commit:
  https://reviews.llvm.org/D37898?vs=115378&id=118606#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D37898

Files:
  llvm/trunk/include/llvm/Target/TargetLowering.h
  llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp


Index: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -8077,6 +8077,7 @@
     Entry.IsSwiftError = false;
     Entry.Alignment = Align;
     CLI.getArgs().insert(CLI.getArgs().begin(), Entry);
+    CLI.NumFixedArgs += 1;
     CLI.RetTy = Type::getVoidTy(CLI.RetTy->getContext());
 
     // sret demotion isn't compatible with tail-calls, since the sret argument
Index: llvm/trunk/include/llvm/Target/TargetLowering.h
===================================================================
--- llvm/trunk/include/llvm/Target/TargetLowering.h
+++ llvm/trunk/include/llvm/Target/TargetLowering.h
@@ -2907,7 +2907,7 @@
       RetTy = ResultType;
       Callee = Target;
       CallConv = CC;
-      NumFixedArgs = Args.size();
+      NumFixedArgs = ArgsList.size();
       Args = std::move(ArgsList);
 
       DAG.getTargetLoweringInfo().markLibCallAttributes(
@@ -2920,7 +2920,7 @@
       RetTy = ResultType;
       Callee = Target;
       CallConv = CC;
-      NumFixedArgs = Args.size();
+      NumFixedArgs = ArgsList.size();
       Args = std::move(ArgsList);
       return *this;
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D37898.118606.patch
Type: text/x-patch
Size: 1297 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171011/2233d893/attachment.bin>