Version 2.12.0-147.0.dev

Merge commit '739393b29096e7528df4ac655044e6b2c9475c6d' into 'dev'

Author: Dart CI

build/toolchain/gcc_toolchain.gni

@@ -204,7 +204,13 @@ template("gcc_toolchain") {
         command += " && " + strip_command
       } else if (defined(invoker.llvm_objcopy)) {
         strip = invoker.llvm_objcopy
-        strip_command = "${strip} --strip-all $outfile $stripped_outfile"
+        if (defined(invoker.llvm_objcopy_extra_args)) {
+          extra_args = invoker.llvm_objcopy_extra_args
+        } else {
+          extra_args = ""
+        }
+        strip_command =
+            "${strip} --strip-all ${extra_args} $outfile $stripped_outfile"
         command += " && " + strip_command
       }
       if (defined(invoker.postlink)) {

build/toolchain/linux/BUILD.gn

@@ -52,6 +52,17 @@ gcc_toolchain("clang_arm") {
   ld = cxx
   llvm_objcopy = "${prefix}/llvm-objcopy"
 
+  # When producing ARM builds we drop .ARM.exidx/extab sections. These sections
+  # don't contain any useful information (we don't use exceptions or
+  # unwind C++ frames and most of the dart binary is in fact not covered by
+  # them), however they have been seen to break dynamic linker in older glibc
+  # versions (pre 2.23) because .ARM.exidx ends up being positioned between
+  # .rel.dyn and .rel.plt sections while older versions of dynamic linker
+  # expect these two sections to appear one after another in the ELF file.
+  # See https://github.com/dart-lang/sdk/issues/41644.
+  llvm_objcopy_extra_args =
+      "--remove-section .ARM.exidx --remove-section .ARM.extab"
+
   toolchain_cpu = "arm"
   toolchain_os = "linux"
   is_clang = true

pkg/kernel/bin/size_breakdown.dart

@@ -62,9 +62,9 @@ class WrappedBinaryBuilder extends BinaryBuilder {
     linkTableSize += byteOffset;
   }
 
-  Map<Uri, Source> readUriToSource() {
+  Map<Uri, Source> readUriToSource(bool readCoverage) {
     uriToSourceSize -= byteOffset;
-    var result = super.readUriToSource();
+    var result = super.readUriToSource(readCoverage);
     uriToSourceSize += byteOffset;
     return result;
   }

pkg/kernel/lib/binary/ast_from_binary.dart

@@ -563,6 +563,8 @@ class BinaryBuilder {
   }
 
   /// Deserializes the source and stores it in [component].
+  /// Note that the _coverage_ normally included in the source in the
+  /// uri-to-source mapping is _not_ included.
   ///
   /// The input bytes may contain multiple files concatenated.
   void readComponentSource(Component component) {
@@ -724,7 +726,7 @@ class BinaryBuilder {
     _ComponentIndex index = _readComponentIndex(componentFileSize);
 
     _byteOffset = index.binaryOffsetForSourceTable;
-    Map<Uri, Source> uriToSource = readUriToSource();
+    Map<Uri, Source> uriToSource = readUriToSource(/* readCoverage = */ false);
     _mergeUriToSource(component.uriToSource, uriToSource);
 
     _byteOffset = _componentStartOffset + componentFileSize;
@@ -773,7 +775,7 @@ class BinaryBuilder {
     _associateMetadata(component, _componentStartOffset);
 
     _byteOffset = index.binaryOffsetForSourceTable;
-    Map<Uri, Source> uriToSource = readUriToSource();
+    Map<Uri, Source> uriToSource = readUriToSource(/* readCoverage = */ true);
     _mergeUriToSource(component.uriToSource, uriToSource);
 
     _byteOffset = index.binaryOffsetForConstantTable;
@@ -821,7 +823,14 @@ class BinaryBuilder {
     return strings;
   }
 
-  Map<Uri, Source> readUriToSource() {
+  /// Read the uri-to-source part of the binary.
+  /// Note that this can include coverage, but that it is only included if
+  /// [readCoverage] is true, otherwise coverage will be skipped. Note also that
+  /// if [readCoverage] is true, references are read and that the link table
+  /// thus has to be read first.
+  Map<Uri, Source> readUriToSource(bool readCoverage) {
+    assert(!readCoverage || (readCoverage && _linkTable != null));
+
     int length = readUint32();
 
     // Read data.
@@ -847,10 +856,16 @@ class BinaryBuilder {
       Set<Reference> coverageConstructors;
       {
         int constructorCoverageCount = readUInt30();
-        coverageConstructors =
-            constructorCoverageCount == 0 ? null : new Set<Reference>();
-        for (int j = 0; j < constructorCoverageCount; ++j) {
-          coverageConstructors.add(readMemberReference());
+        if (readCoverage) {
+          coverageConstructors =
+              constructorCoverageCount == 0 ? null : new Set<Reference>();
+          for (int j = 0; j < constructorCoverageCount; ++j) {
+            coverageConstructors.add(readMemberReference());
+          }
+        } else {
+          for (int j = 0; j < constructorCoverageCount; ++j) {
+            skipMemberReference();
+          }
         }
       }
 
@@ -906,6 +921,10 @@ class BinaryBuilder {
     }
   }
 
+  void skipCanonicalNameReference() {
+    readUInt30();
+  }
+
   CanonicalName readCanonicalNameReference() {
     int index = readUInt30();
     if (index == 0) return null;
@@ -937,6 +956,10 @@ class BinaryBuilder {
     return name?.getReference();
   }
 
+  void skipMemberReference() {
+    skipCanonicalNameReference();
+  }
+
   Reference readMemberReference({bool allowNull: false}) {
     CanonicalName name = readCanonicalNameReference();
     if (name == null && !allowNull) {

pkg/kernel/test/binary/can_read_platform_test.dart

@@ -83,6 +83,9 @@ bool canRead(File dill) {
     new BinaryBuilderWithMetadata(bytes).readComponent(component);
     int libs = component.libraries.length;
 
+    component = new Component();
+    new BinaryBuilderWithMetadata(bytes).readComponentSource(component);
+
     component = new Component();
     new BinaryBuilder(bytes).readComponent(component);
     if (libs != component.libraries.length) {
@@ -91,6 +94,9 @@ bool canRead(File dill) {
           "when reading with BinaryBuilder";
     }
 
+    component = new Component();
+    new BinaryBuilder(bytes).readComponentSource(component);
+
     return true;
   } catch (e, st) {
     print("Error for $dill:");

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 12
 PATCH 0
-PRERELEASE 146
+PRERELEASE 147
 PRERELEASE_PATCH 0