[vm/ffi] Fix source information in generated AST nodes

dcharkes · commit-bot@chromium.org · commit f9cedb681376 · 2019-11-28T16:07:45.000Z
Fixes: flutter/flutter#39916 Fix verified by manually generating the assembly snapshot and seeing the offending DWARF output be fixed. Old DWARF: ``` .string "" // Empty filename in file table. .uleb128 0 .uleb128 0 .uleb128 0 ``` New DWARF: ``` .string "dart:ffi/struct.dart" .uleb128 0 .uleb128 0 .uleb128 0 ``` Change-Id: I60b6ff349deb70148c1a475b242c99e7c582d8c4 Cq-Include-Trybots: luci.dart.try:vm-ffi-android-debug-arm-try,vm-ffi-android-debug-arm64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/126650 Commit-Queue: Daco Harkes <dacoharkes@google.com> Auto-Submit: Daco Harkes <dacoharkes@google.com> Reviewed-by: Martin Kustermann <kustermann@google.com>
diff --git a/pkg/front_end/testcases/general/ffi_sample.dart.strong.transformed.expect b/pkg/front_end/testcases/general/ffi_sample.dart.strong.transformed.expect
@@ -10,7 +10,7 @@ import "package:ffi/ffi.dart";
 @#C3
 class Coordinate extends ffi::Struct {
   @#C3
-  static final field core::int* #sizeOf = (#C6).{core::List::[]}(ffi::_abi())/* from null */;
+  static final field core::int* #sizeOf = (#C6).{core::List::[]}(ffi::_abi());
   @#C3
   constructor #fromPointer(dynamic #pointer) → dynamic
     : super ffi::Struct::_fromPointer(#pointer)
diff --git a/pkg/vm/lib/transformations/ffi_definitions.dart b/pkg/vm/lib/transformations/ffi_definitions.dart
@@ -217,7 +217,9 @@ class _FfiDefinitionTransformer extends FfiTransformer {
         name: Name("#fromPointer"),
         initializers: [
           SuperInitializer(structFromPointer, Arguments([VariableGet(pointer)]))
-        ]);
+        ],
+        fileUri: node.fileUri)
+      ..fileOffset = node.fileOffset;
     _makeEntryPoint(ctor);
     node.addMember(ctor);
   }
@@ -378,7 +380,9 @@ class _FfiDefinitionTransformer extends FfiTransformer {
         isStatic: true,
         isFinal: true,
         initializer: _runtimeBranchOnLayout(sizes),
-        type: InterfaceType(intClass, Nullability.legacy));
+        type: InterfaceType(intClass, Nullability.legacy),
+        fileUri: struct.fileUri)
+      ..fileOffset = struct.fileOffset;
     _makeEntryPoint(sizeOf);
     struct.addMember(sizeOf);
   }
diff --git a/runtime/vm/dwarf.cc b/runtime/vm/dwarf.cc
@@ -635,6 +635,7 @@ void Dwarf::WriteLines() {
   for (intptr_t i = 0; i < scripts_.length(); i++) {
     const Script& script = *(scripts_[i]);
     uri = script.url();
+    RELEASE_ASSERT(strlen(uri.ToCString()) != 0);
     string(uri.ToCString());  // NOLINT
     uleb128(0);  // Include directory index.
     uleb128(0);  // File modification time.
