[lldb] Pass the target triple to the compiler when determining the DWARF version

[JDevlieghere]

Summary

When targeting iOS, the default dwarf version is 2 and not 4. Currently, the test suite does not pick up on that because it invokes the test compiler without a target triple. This patch fixes that and now correctly skips tests that have a dwarf version specified in a skipIf decorator.

rdar://84530477

[teemperor]

Some nits but otherwise LGTM

lldb/packages/Python/lldbsuite/test/builders/builder.py

26

Maybe return None? Then the calling code crashes if it doesn't handle the value instead of silently picking the next arg as some bogus triple value.

lldb/packages/Python/lldbsuite/test/builders/darwin.py

60

values = [arch, vendor, os, version, env]
if None in values:
    return ""
return '-'.join(values)

[vsk]

Thanks! Lgtm as well, but with the same nits as Raphael.

lldb/packages/Python/lldbsuite/test/builders/builder.py

def getArchitecture(self):
         return configuration.arch if configuration.arch else ""
 
     def getCompiler(self):
         """Returns the compiler in effect the test suite is running with."""
         compiler = configuration.compiler if configuration.compiler else "clang"
         compiler = lldbutil.which(compiler)
         return os.path.abspath(compiler)
 
+    def getTriple(self, arch):
+        """Returns the triple for the given architecture or None."""
+        return None
+
     def getExtraMakeArgs(self):
         """
         Helper function to return extra argumentsfor the make system. This
         method is meant to be overridden by platform specific builders.
         """
         return []
 
     def getArchCFlags(self, architecture):

lldb/packages/Python/lldbsuite/test/builders/darwin.py

def get_triple():
     version = lldbutil.get_xcode_sdk_version(sdk)
     if version is None:
         return None, None, None, None
 
     return vendor, os, version, env
 
 
 class BuilderDarwin(Builder):
+    def getTriple(self, arch):
+        vendor, os, version, env = get_triple()
+        components = [arch, vendor, os, version, env]
+        if None in components:
+            return None
+        return '-'.join(components)
+
     def getExtraMakeArgs(self):
         """
         Helper function to return extra argumentsfor the make system. This
         method is meant to be overridden by platform specific builders.
         """
         args = dict()
 
         if configuration.dsymutil:

lldb/packages/Python/lldbsuite/test/lldbtest.py

def getCompilerVersion(self):
         return 'unknown'
 
     def getDwarfVersion(self):
         """ Returns the dwarf version generated by clang or '0'. """
         if configuration.dwarf_version:
             return str(configuration.dwarf_version)
         if 'clang' in self.getCompiler():
             try:
+                triple = builder_module().getTriple(self.getArchitecture())
+                target = ['-target', triple] if triple else []
                 driver_output = check_output(
-                    [self.getCompiler()] + '-g -c -x c - -o - -###'.split(),
+                    [self.getCompiler()] + target + '-g -c -x c - -o - -###'.split(),
                     stderr=STDOUT)
                 driver_output = driver_output.decode("utf-8")
                 for line in driver_output.split(os.linesep):
                     m = re.search('dwarf-version=([0-9])', line)
                     if m:
                         return m.group(1)
-            except: pass
+            except CalledProcessError:
+                pass
         return '0'
 
     def platformIsDarwin(self):
         """Returns true if the OS triple for the selected platform is any valid apple OS"""
         return lldbplatformutil.platformIsDarwin()
 
     def hasDarwinFramework(self):
         return self.darwinWithFramework