Fix debugserver reporting of deployment target

[aprantl]

Summary

This patch fixes debugserver incorrectly returning the SDK version instead of the minimum deployment target version.

rdar://problem/65001691

[aprantl]

delete a redundant statement

[friss]

LGTM

lldb/test/API/macosx/simulator/TestSimulatorPlatform.py

30

typo?

47

add a break to get out of the loop quicker?

[aprantl]

lldb/test/API/macosx/simulator/TestSimulatorPlatform.py

47

No, that's a hidden feature. In the simulator cases jGetLoadedDynamicLibrariesInfos is called twice and the interesting information is only in the second response.

lldb/test/API/macosx/simulator/TestSimulatorPlatform.py

def check_load_commands(self, expected_load_command):
             ['otool', '-l', self.getBuildArtifact()]
         ).decode("utf-8")
         found = 0
         for line in load_cmds.split('\n'):
             if expected_load_command in line:
               found += 1
         self.assertEquals(found, 1, "wrong load command")
 
+    def check_debugserver(self, log, expected_platform, expected_version):
+        """scan the debugserver packet log"""
+        logfile = open(log, "r")
+        dylib_info = None
+        response = False
+        for line in logfile:
+            if response:
+                while line[0] != '$':
+                    line = line[1:]
+                line = line[1:]
+                # Unescape '}'.
+                dylib_info = json.loads(line.replace('}]','}')[:-4])
+                response = False
+            if 'send packet: $jGetLoadedDynamicLibrariesInfos:{' in line:
+                response = True
+
+        self.assertTrue(dylib_info)
+        aout_info = None
+        for image in dylib_info['images']:
+            if image['pathname'].endswith('a.out'):
+                aout_info = image
+        self.assertTrue(aout_info)
+        self.assertEquals(aout_info['min_version_os_name'], expected_platform)
+        if expected_version:
+            self.assertEquals(aout_info['min_version_os_sdk'], expected_version)
 
-    def run_with(self, arch, os, env, expected_load_command):
-        self.build(dictionary={'TRIPLE': arch+'-apple-'+os+'-'+env})
+
+    def run_with(self, arch, os, vers, env, expected_load_command):
+        self.build(dictionary={'TRIPLE': arch+'-apple-'+os+vers+'-'+env})
+        self.check_load_commands(expected_load_command)
+        log = self.getBuildArtifact('packets.log')
+        self.expect("log enable gdb-remote packets -f "+log)
         lldbutil.run_to_source_breakpoint(self, "break here",
                                           lldb.SBFileSpec("hello.c"))
-        self.check_load_commands(expected_load_command)
         self.expect('image list -b -t',
-                    patterns=['a\.out '+arch+'-apple-'+os+'.*-'+env])
+                    patterns=['a\.out '+arch+'-apple-'+os+vers+'.*-'+env])
+        self.check_debugserver(log, os+env, vers)
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('iphone')
     def test_ios(self):
         """Test running an iOS simulator binary"""
         self.run_with(arch=self.getArchitecture(),
-                      os='ios', env='simulator',
+                      os='ios', vers='', env='simulator',
                       expected_load_command='LC_BUILD_VERSION')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('appletv')
     def test_tvos(self):
         """Test running an tvOS simulator binary"""
         self.run_with(arch=self.getArchitecture(),
-                      os='tvos', env='simulator',
+                      os='tvos', vers='', env='simulator',
                       expected_load_command='LC_BUILD_VERSION')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('watch')
     @skipIfDarwin # rdar://problem/64552748
     @skipIf(archs=['arm64','arm64e'])
     def test_watchos_i386(self):
         """Test running a 32-bit watchOS simulator binary"""
         self.run_with(arch='i386',
-                      os='watchos', env='simulator',
+                      os='watchos', vers='', env='simulator',
                       expected_load_command='LC_BUILD_VERSION')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('watch')
     @skipIfDarwin # rdar://problem/64552748
     @skipIf(archs=['i386','x86_64'])
     def test_watchos_armv7k(self):
         """Test running a 32-bit watchOS simulator binary"""
         self.run_with(arch='armv7k',
-                      os='watchos', env='simulator',
+                      os='watchos', vers='', env='simulator',
                       expected_load_command='LC_BUILD_VERSION')
 
 
     #
     # Back-deployment tests.
     #
     # Older Mach-O versions used less expressive load commands, such
     # as LC_VERSION_MIN_IPHONEOS that wouldn't distinguish between ios
     # and ios-simulator.  When targeting a simulator on Apple Silicon
     # macOS, however, these legacy load commands are never generated.
     #
         
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('iphone')
     @skipIf(archs=['arm64','arm64e'])
     def test_lc_version_min_iphoneos(self):
         """Test running a back-deploying iOS simulator binary
            with a legacy iOS load command"""
         self.run_with(arch=self.getArchitecture(),
-                      os='ios11.0', env='simulator',
+                      os='ios', vers='11.0', env='simulator',
                       expected_load_command='LC_VERSION_MIN_IPHONEOS')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('iphone')
+    @skipIf(archs=['arm64','arm64e'])
+    def test_ios_backdeploy_x86(self):
+        """Test running a back-deploying iOS simulator binary
+           with a legacy iOS load command"""
+        self.run_with(arch=self.getArchitecture(),
+                      os='ios', vers='13.0', env='simulator',
+                      expected_load_command='LC_BUILD_VERSION')
+
+    @skipUnlessDarwin
+    @skipIfDarwinEmbedded
+    @apple_simulator_test('iphone')
     @skipIf(archs=['i386','x86_64'])
     def test_ios_backdeploy_apple_silicon(self):
         """Test running a back-deploying iOS simulator binary"""
         self.run_with(arch=self.getArchitecture(),
-                      os='ios11.0', env='simulator',
+                      os='ios', vers='11.0', env='simulator',
                       expected_load_command='LC_BUILD_VERSION')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('appletv')
     @skipIf(archs=['arm64','arm64e'])
     def test_lc_version_min_tvos(self):
         """Test running a back-deploying tvOS simulator binary
            with a legacy tvOS load command"""
         self.run_with(arch=self.getArchitecture(),
-                      os='tvos11.0', env='simulator',
+                      os='tvos', vers='11.0', env='simulator',
                       expected_load_command='LC_VERSION_MIN_TVOS')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('appletv')
     @skipIf(archs=['i386','x86_64'])
     def test_tvos_backdeploy_apple_silicon(self):
         """Test running a back-deploying tvOS simulator binary"""
         self.run_with(arch=self.getArchitecture(),
-                      os='tvos11.0', env='simulator',
+                      os='tvos', vers='11.0', env='simulator',
                       expected_load_command='LC_BUILD_VERSION')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('watch')
     @skipIf(archs=['arm64','arm64e'])
     @skipIfDarwin # rdar://problem/64552748
     def test_lc_version_min_watchos(self):
         """Test running a back-deploying watchOS simulator binary
            with a legacy watchOS load command"""
         self.run_with(arch='i386',
-                      os='watchos4.0', env='simulator',
+                      os='watchos', vers='4.0', env='simulator',
                       expected_load_command='LC_VERSION_MIN_WATCHOS')
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @apple_simulator_test('watch')
     @skipIf(archs=['arm64','arm64e'])
     @skipIfDarwin # rdar://problem/64552748
     def test_watchos_backdeploy_apple_silicon(self):
         """Test running a back-deploying watchOS simulator binary"""
         self.run_with(arch='armv7k',
-                      os='watchos4.0', env='simulator',
+                      os='watchos', vers='4.0', env='simulator',
                       expected_load_command='LC_BUILD_VERSION')

lldb/tools/debugserver/source/MacOSX/MachProcess.mm

MachProcess::GetDeploymentInfo(const struct load_command &lc,
   // Handle the older LC_VERSION load commands, which don't
   // distinguish between simulator and real hardware.
   auto handle_version_min = [&](char platform) {
     struct version_min_command vers_cmd;
     if (ReadMemory(load_command_address, sizeof(struct version_min_command),
                    &vers_cmd) != sizeof(struct version_min_command))
       return;
     info.platform = platform;
-    info.major_version = vers_cmd.sdk >> 16;
-    info.minor_version = (vers_cmd.sdk >> 8) & 0xffu;
-    info.patch_version = vers_cmd.sdk & 0xffu;
+    info.major_version = vers_cmd.version >> 16;
+    info.minor_version = (vers_cmd.version >> 8) & 0xffu;
+    info.patch_version = vers_cmd.version & 0xffu;
     info.maybe_simulator = true;
   };
   switch (cmd) {
   case LC_VERSION_MIN_IPHONEOS:
     handle_version_min(PLATFORM_IOS);
     break;
   case LC_VERSION_MIN_MACOSX:
     handle_version_min(PLATFORM_MACOS);
     break;
   case LC_VERSION_MIN_TVOS:
     handle_version_min(PLATFORM_TVOS);
     break;
   case LC_VERSION_MIN_WATCHOS:
     handle_version_min(PLATFORM_WATCHOS);
     break;
 #if defined(LC_BUILD_VERSION)
   case LC_BUILD_VERSION: {
     struct build_version_command build_vers;
     if (ReadMemory(load_command_address, sizeof(struct build_version_command),
                    &build_vers) != sizeof(struct build_version_command))
       break;
     info.platform = build_vers.platform;
-    info.major_version = build_vers.sdk >> 16;
-    info.minor_version = (build_vers.sdk >> 8) & 0xffu;
-    info.patch_version = build_vers.sdk & 0xffu;
+    info.major_version = build_vers.minos >> 16;
+    info.minor_version = (build_vers.minos >> 8) & 0xffu;
+    info.patch_version = build_vers.minos & 0xffu;
     break;
   }
 #endif
   }
   return info;
 }
 
 const char *MachProcess::GetPlatformString(unsigned char platform) {