[PATCH] D125439: Ensure that the MRI CREATE/CREATETHIN commands overwrite the output file appropriately

[Phabricator via llvm-commits]

This revision was not accepted when it landed; it landed in state "Needs Review".
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGb074275067be: [llvm-ar][mri] Ensure CREATE commands overwrite the output file (authored by Ben Dunbobbin <Ben.Dunbobbin at sony.com>).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D125439/new/

https://reviews.llvm.org/D125439

Files:
  llvm/test/tools/llvm-ar/mri-create-overwrite.test
  llvm/tools/llvm-ar/llvm-ar.cpp


Index: llvm/tools/llvm-ar/llvm-ar.cpp
===================================================================
--- llvm/tools/llvm-ar/llvm-ar.cpp
+++ llvm/tools/llvm-ar/llvm-ar.cpp
@@ -1138,7 +1138,8 @@
 
   // Nothing to do if not saved.
   if (Saved)
-    performOperation(ReplaceOrInsert, &NewMembers);
+    performOperation(ReplaceOrInsert, /*OldArchive=*/nullptr,
+                     /*OldArchiveBuf=*/ nullptr, &NewMembers);
   exit(0);
 }
 
Index: llvm/test/tools/llvm-ar/mri-create-overwrite.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-ar/mri-create-overwrite.test
@@ -0,0 +1,70 @@
+## Show that CREATE/CREATETHIN overwrite existing files appropriately.
+
+# RUN: rm -rf %t
+# RUN: split-file %s %t
+# RUN: cd %t
+
+## Show that an existing file that is not an archive is overwritten by CREATE.
+# RUN: touch test.a
+# RUN: llvm-ar -M < create.mri
+# RUN: FileCheck --input-file=test.a %s --check-prefixes=ARCH,TWO
+
+## Show that an existing file that is not an archive is overwritten by CREATETHIN.
+# RUN: rm -f test.a
+# RUN: touch test.a
+# RUN: llvm-ar -M < createthin.mri
+# RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,TWO
+
+## Show that an existing regular archive is overwritten by CREATE.
+# RUN: rm -f test.a
+# RUN: llvm-ar cr test.a 1.txt
+# RUN: llvm-ar -M < create.mri
+# RUN: llvm-ar tv test.a
+# RUN: FileCheck --input-file=test.a %s --check-prefixes=ARCH,TWO --implicit-check-not=1.txt
+
+## Show that an existing regular archive is overwritten by CREATETHIN.
+# RUN: rm -f test.a
+# RUN: llvm-ar cr test.a 1.txt
+# RUN: llvm-ar -M < createthin.mri
+# RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,TWO --implicit-check-not=1.txt
+
+## Show that an existing thin archive is overwritten by CREATE.
+# RUN: rm -f test.a
+# RUN: llvm-ar crT test.a 1.txt
+# RUN: llvm-ar -M < create.mri
+# RUN: FileCheck --input-file=test.a %s --check-prefixes=ARCH,TWO --implicit-check-not=1.txt
+
+## Show that an existing thin archive is overwritten by CREATETHIN.
+# RUN: rm -f test.a
+# RUN: llvm-ar crT test.a 1.txt
+# RUN: llvm-ar -M < createthin.mri
+# RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,TWO --implicit-check-not=1.txt
+
+## Show that the output is not overwritten without a SAVE.
+# RUN: rm -f test.a
+# RUN: llvm-ar crT test.a 1.txt
+# RUN: llvm-ar -M < nosave.mri
+# RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,ONE --implicit-check-not=2.txt
+
+# ARCH: !<arch>
+# THIN: !<thin>
+# ONE:  1.txt
+# TWO:  2.txt
+
+#--- 1.txt
+
+#--- 2.txt
+
+#--- create.mri
+CREATE test.a
+ADDMOD 2.txt
+SAVE
+
+#--- createthin.mri
+CREATETHIN test.a
+ADDMOD 2.txt
+SAVE
+
+#--- nosave.mri
+CREATE test.a
+ADDMOD 2.txt


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D125439.429375.patch
Type: text/x-patch
Size: 2753 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220513/21858da8/attachment.bin>