AsmPrinter: Fix wrong OS X versions being emitted for darwin triples

[MatzeB]

Summary

The confusion arose when emitting a .macosx_version_min directive for a
"*-*-darwin" triple which needs version number adjustments.
Use the utility functions in TargetTriple for this.

Fixes rdar://22056966

[MatzeB]

ping

[MatzeB]

ping2

[MatzeB]

ping3

This should be an obvious patch and easy to review

[t.p.northover]

Sorry about the delay. I think this is OK.

Tim.

llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

bool AsmPrinter::doInitialization(Module &M) {
   //
   // FIXME: If we end up with a collection of these sorts of Darwin-specific
   // or ELF-specific things, it may make sense to have a platform helper class
   // that will work with the target helper class. For now keep it here, as the
   // alternative is duplicated code in each of the target asm printers that
   // use the directive, where it would need the same conditionalization
   // anyway.
   Triple TT(getTargetTriple());
-  if (TT.isOSDarwin()) {
-    unsigned Major, Minor, Update;
-    TT.getOSVersion(Major, Minor, Update);
-    // If there is a version specified, Major will be non-zero.
-    if (Major) {
-      MCVersionMinType VersionType;
-      if (TT.isWatchOS())
-        VersionType = MCVM_WatchOSVersionMin;
-      else if (TT.isTvOS())
-        VersionType = MCVM_TvOSVersionMin;
-      else if (TT.isMacOSX())
-        VersionType = MCVM_OSXVersionMin;
-      else
-        VersionType = MCVM_IOSVersionMin;
-      OutStreamer->EmitVersionMin(VersionType, Major, Minor, Update);
+  if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0) {
+    unsigned Major, Minor, Update;
+    if (TT.isWatchOS()) {
+      TT.getWatchOSVersion(Major, Minor, Update);
+    } else if (TT.isTvOS()) {
+      TT.getiOSVersion(Major, Minor, Update);
+    } else if (TT.isMacOSX()) {
+      if (!TT.getMacOSXVersion(Major, Minor, Update))
+        Major = 0;
+    } else {
+      TT.getiOSVersion(Major, Minor, Update);
     }
+    if (Major != 0)
+      OutStreamer->EmitVersionMin(VersionType, Major, Minor, Update);
   }
 
   // Allow the target to emit any magic that it wants at the start of the file.
   EmitStartOfAsmFile(M);
 
   // Very minimal debug info. It is ignored if we emit actual debug info. If we
   // don't, this at least helps the user find where a global came from.
   if (MAI->hasSingleParameterDotFile()) {

llvm/trunk/test/CodeGen/X86/2008-11-03-F80VAARG.ll

-; RUN: llc < %s -march=x86 -o - | not grep 10
+; RUN: llc < %s -march=x86 -o - | FileCheck %s
 
 declare void @llvm.va_start(i8*) nounwind
 
 declare void @llvm.va_copy(i8*, i8*) nounwind
 
 declare void @llvm.va_end(i8*) nounwind
 
+; CHECK-LABEL: test:
+; CHECK-NOT: 10
 define x86_fp80 @test(...) nounwind {
   %ap = alloca i8*    ; <i8**> [#uses=3]
   %v1 = bitcast i8** %ap to i8*    ; <i8*> [#uses=1]
   call void @llvm.va_start(i8* %v1)
   %t1 = va_arg i8** %ap, x86_fp80    ; <x86_fp80> [#uses=1]
   %t2 = va_arg i8** %ap, x86_fp80    ; <x86_fp80> [#uses=1]
   %t = fadd x86_fp80 %t1, %t2   ; <x86_fp80> [#uses=1]
   ret x86_fp80 %t
 }

llvm/trunk/test/CodeGen/X86/version_directive.ll

+; RUN: llc -mtriple x86_64-apple-darwin15.0.0 -o - /dev/null | FileCheck %s
+; RUN: llc -mtriple x86_64-apple-macosx10.11.0 -o - /dev/null | FileCheck %s
+
+; CHECK: .macosx_version_min 10, 11