Roll clang with fix for ABI change

flutter · Aug 22, 2023 · 57ea3f3 · 57ea3f3
1 parent 4542284
commit 57ea3f3
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/DEPS b/DEPS
@@ -39,7 +39,7 @@ vars = {
   # The list of revisions for these tools comes from Fuchsia, here:
   # https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
   # If there are problems with the toolchain, contact fuchsia-toolchain@.
-  'clang_version': 'git_revision:6d667d4b261e81f325756fdfd5bb43b3b3d2451d',
+  'clang_version': 'git_revision:020d2fb7711d70e296f19d83565f8d93d2cfda71',
 
   # The goma version and the clang version can be tightly coupled. If goma
   # stops working on a clang roll, this may need to be updated using the value

diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -2572,6 +2572,7 @@ ORIGIN: ../../../flutter/shell/platform/common/text_editing_delta.h + ../../../f
 ORIGIN: ../../../flutter/shell/platform/common/text_input_model.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/text_input_model.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/common/text_range.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/common/command_line.h + ../../../flutter/LICENSE
@@ -5316,6 +5317,7 @@ FILE: ../../../flutter/shell/platform/common/text_editing_delta.h
 FILE: ../../../flutter/shell/platform/common/text_input_model.cc
 FILE: ../../../flutter/shell/platform/common/text_input_model.h
 FILE: ../../../flutter/shell/platform/common/text_range.h
+FILE: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm
 FILE: ../../../flutter/shell/platform/darwin/common/command_line.h

diff --git a/shell/platform/darwin/common/BUILD.gn b/shell/platform/darwin/common/BUILD.gn
@@ -13,6 +13,7 @@ source_set("common") {
   cflags_objcc = flutter_cflags_objcc
 
   sources = [
+    "availability_version_check.cc",
     "buffer_conversions.h",
     "buffer_conversions.mm",
     "command_line.h",

diff --git a/shell/platform/darwin/common/availability_version_check.cc b/shell/platform/darwin/common/availability_version_check.cc
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <dispatch/dispatch.h>
+#include <dlfcn.h>
+#include <cstdint>
+
+#include "flutter/fml/logging.h"
+
+namespace {
+
+typedef uint32_t dyld_platform_t;
+
+typedef struct {
+  dyld_platform_t platform;
+  uint32_t version;
+} dyld_build_version_t;
+
+typedef bool (*AvailabilityVersionCheckFn)(uint32_t count,
+                                           dyld_build_version_t versions[]);
+
+AvailabilityVersionCheckFn AvailabilityVersionCheck;
+
+dispatch_once_t DispatchOnceCounter;
+
+void InitializeAvailabilityCheck(void* unused) {
+  if (AvailabilityVersionCheck) {
+    return;
+  }
+  AvailabilityVersionCheck = reinterpret_cast<AvailabilityVersionCheckFn>(
+      dlsym(RTLD_DEFAULT, "_availability_version_check"));
+  FML_CHECK(AvailabilityVersionCheck);
+}
+
+extern "C" bool _availability_version_check(uint32_t count,
+                                            dyld_build_version_t versions[]) {
+  dispatch_once_f(&DispatchOnceCounter, NULL, InitializeAvailabilityCheck);
+  return AvailabilityVersionCheck(count, versions);
+}
+
+}  // namespace
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm
@@ -46,7 +46,9 @@ - (BOOL)handleOpenURLs:(NSArray<NSURL*>*)urls {
       [[AppDelegateTestFlutterAppLifecycleDelegate alloc] init];
   [appDelegate addApplicationLifecycleDelegate:delegate];
 
-  NSArray<NSURL*>* URLs = @[ [NSURL URLWithString:@"https://flutter.dev"] ];
+  NSURL* URL = [NSURL URLWithString:@"https://flutter.dev"];
+  EXPECT_NE(URL, nil);
+  NSArray<NSURL*>* URLs = @[ URL ];
   [appDelegate application:NSApplication.sharedApplication openURLs:URLs];
 
   EXPECT_EQ([delegate receivedURLs], URLs);
@@ -61,7 +63,9 @@ - (BOOL)handleOpenURLs:(NSArray<NSURL*>*)urls {
   [appDelegate addApplicationLifecycleDelegate:firstDelegate];
   [appDelegate addApplicationLifecycleDelegate:secondDelegate];
 
-  NSArray<NSURL*>* URLs = @[ [NSURL URLWithString:@"https://flutter.dev"] ];
+  NSURL* URL = [NSURL URLWithString:@"https://flutter.dev"];
+  EXPECT_NE(URL, nil);
+  NSArray<NSURL*>* URLs = @[ URL ];
   [appDelegate application:NSApplication.sharedApplication openURLs:URLs];
 
   EXPECT_EQ([firstDelegate receivedURLs], URLs);