[Lldb-commits] [PATCH] D83582: Fix nesting of #ifdef

Adrian Prantl via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Fri Jul 10 12:23:46 PDT 2020


aprantl updated this revision to Diff 277122.
aprantl added a comment.

Also move comment.


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

https://reviews.llvm.org/D83582

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


Index: lldb/tools/debugserver/source/MacOSX/MachProcess.mm
===================================================================
--- lldb/tools/debugserver/source/MacOSX/MachProcess.mm
+++ lldb/tools/debugserver/source/MacOSX/MachProcess.mm
@@ -780,11 +780,11 @@
     if (DeploymentInfo deployment_info = GetDeploymentInfo(lc, load_cmds_p)) {
       // Simulator support. If the platform is ambiguous, use the dyld info.
       if (deployment_info.maybe_simulator) {
-        // If dyld doesn't return a platform, use a heuristic.
-#if (defined(__x86_64__) || defined(__i386__))
-        // If we are running on Intel macOS, it is safe to assume
-        // this is really a back-deploying simulator binary.
         if (deployment_info.maybe_simulator) {
+#if (defined(__x86_64__) || defined(__i386__))
+          // If dyld doesn't return a platform, use a heuristic.
+          // If we are running on Intel macOS, it is safe to assume
+          // this is really a back-deploying simulator binary.
           switch (deployment_info.platform) {
           case PLATFORM_IOS:
             deployment_info.platform = PLATFORM_IOSSIMULATOR;
@@ -797,12 +797,12 @@
             break;
           }
 #else
-        // On an Apple Silicon macOS host, there is no
-        // ambiguity. The only binaries that use legacy load
-        // commands are back-deploying native iOS binaries. All
-        // simulator binaries use the newer, unambiguous
-        // LC_BUILD_VERSION load commands.
-        deployment_info.maybe_simulator = false;
+          // On an Apple Silicon macOS host, there is no
+          // ambiguity. The only binaries that use legacy load
+          // commands are back-deploying native iOS binaries. All
+          // simulator binaries use the newer, unambiguous
+          // LC_BUILD_VERSION load commands.
+          deployment_info.maybe_simulator = false;
 #endif
         }
       }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D83582.277122.patch
Type: text/x-patch
Size: 1913 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20200710/6d7d2dba/attachment.bin>


More information about the lldb-commits mailing list