fix more tests

Author: matthias-springer

mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp

@@ -284,8 +284,10 @@ static void restoreByValRefArgumentType(
   for (const auto &[arg, oldArg, byValRefAttr] :
        llvm::zip(funcOp.getArguments(), oldBlockArgs, byValRefNonPtrAttrs)) {
     // Skip argument if no `llvm.byval` or `llvm.byref` attribute.
-    if (!byValRefAttr)
+    if (!byValRefAttr) {
+      llvm::errs() << "NO ATTR!\n";
       continue;
+    }
 
     // Insert load to retrieve the actual argument passed by value/reference.
     assert(isa<LLVM::LLVMPointerType>(arg.getType()) &&

mlir/lib/Transforms/Utils/DialectConversion.cpp

@@ -1677,7 +1677,9 @@ void ConversionPatternRewriter::replaceUsesOfBlockArgument(BlockArgument from,
                              << "'(" << from.getOwner()->getParentOp() << ")\n";
   });
   impl->appendRewrite<ReplaceBlockArgRewrite>(from.getOwner(), from);
-  impl->mapping.map(from, to);
+  SmallVector<Value, 1> mapped = impl->mapping.lookupOrDefault(from);
+  assert(mapped.size() == 1 && "replaceUsesOfBlockArgument is not supported for 1:N replacements");
+  impl->mapping.map(mapped.front(), to);
 }
 
 Value ConversionPatternRewriter::getRemappedValue(Value key) {