[S] Change in dart/sdk[main]: [build] Make `build_analyze_snapshot` consistent between the host and...

3 views
Skip to first unread message

Ryan Macnak (Gerrit)

unread,
Feb 3, 2023, 3:41:16 PM2/3/23
to rev...@dartlang.org, vm-...@dartlang.org, Daco Harkes, CBuild, Commit Queue

Attention is currently required from: Daco Harkes.

View Change

1 comment:

  • File runtime/runtime_args.gni:

    • Patch Set #1, Line 95: (target_os == "linux" || target_os == "android") &&

      is_android means current_os == "android"

      "runtime" deps on "analyze_snapshot" and "analyze_snapshot($host_toolchain)"

      the latter was not defined under the host toolchain because for it is_android is false

To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
Gerrit-Change-Number: 280782
Gerrit-PatchSet: 1
Gerrit-Owner: Ryan Macnak <rma...@google.com>
Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
Gerrit-Attention: Daco Harkes <dacoh...@google.com>
Gerrit-Comment-Date: Fri, 03 Feb 2023 20:41:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Ryan Macnak (Gerrit)

unread,
Feb 3, 2023, 3:41:16 PM2/3/23
to Daco Harkes, rev...@dartlang.org, vm-...@dartlang.org

Attention is currently required from: Daco Harkes.

Ryan Macnak would like Daco Harkes to review this change.

View Change

[build] Make `build_analyze_snapshot` consistent between the host and target toolchains.

Bug: https://github.com/dart-lang/sdk/issues/51242
Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
---
M runtime/runtime_args.gni
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/runtime/runtime_args.gni b/runtime/runtime_args.gni
index 0c4f1ea..b3eac69 100644
--- a/runtime/runtime_args.gni
+++ b/runtime/runtime_args.gni
@@ -92,6 +92,6 @@
# The analyze_snapshot tool is only supported on 64 bit AOT builds running
# under linux and android platforms
build_analyze_snapshot =
- (is_linux || is_android) &&
+ (target_os == "linux" || target_os == "android") &&
(dart_target_arch == "x64" || dart_target_arch == "arm64")
}

To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
Gerrit-Change-Number: 280782
Gerrit-PatchSet: 1
Gerrit-Owner: Ryan Macnak <rma...@google.com>
Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
Gerrit-Attention: Daco Harkes <dacoh...@google.com>
Gerrit-MessageType: newchange

Daco Harkes (Gerrit)

unread,
Feb 6, 2023, 5:40:39 AM2/6/23
to Ryan Macnak, rev...@dartlang.org, vm-...@dartlang.org, CBuild, Commit Queue

Attention is currently required from: Ryan Macnak.

Patch set 1:Code-Review +1

View Change

2 comments:

  • Commit Message:

    • Patch Set #1, Line 7: [build] Make `build_analyze_snapshot` consistent between the host and target toolchains.

      Should we consider running the build on an M1 bot so that we ensure we don't break the build again?

  • Patchset:

To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
Gerrit-Change-Number: 280782
Gerrit-PatchSet: 1
Gerrit-Owner: Ryan Macnak <rma...@google.com>
Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
Gerrit-Attention: Ryan Macnak <rma...@google.com>
Gerrit-Comment-Date: Mon, 06 Feb 2023 10:40:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Ryan Macnak (Gerrit)

unread,
Feb 6, 2023, 12:21:49 PM2/6/23
to rev...@dartlang.org, vm-...@dartlang.org, Daco Harkes, CBuild, Commit Queue

Attention is currently required from: Daco Harkes.

Patch set 1:Commit-Queue +2

View Change

1 comment:

  • Commit Message:

    • Patch Set #1, Line 7: [build] Make `build_analyze_snapshot` consistent between the host and target toolchains.

      Should we consider running the build on an M1 bot so that we ensure we don't break the build again?

    • (In this case both x64 and ARM64 Macs were affected.)

      I don't think there are enough Android devices for a full mac-host-android-target bot, but maybe a build-only bot? We don't have anything for windows-host-android-target either.

      And now that I think about it, we're still using an NDK that requires Rosetta for ARM64 Mac.

To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
Gerrit-Change-Number: 280782
Gerrit-PatchSet: 1
Gerrit-Owner: Ryan Macnak <rma...@google.com>
Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
Gerrit-Attention: Daco Harkes <dacoh...@google.com>
Gerrit-Comment-Date: Mon, 06 Feb 2023 17:21:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: Daco Harkes <dacoh...@google.com>
Gerrit-MessageType: comment

Daco Harkes (Gerrit)

unread,
Feb 6, 2023, 12:23:24 PM2/6/23
to Ryan Macnak, rev...@dartlang.org, vm-...@dartlang.org, CBuild, Commit Queue

Attention is currently required from: Ryan Macnak.

View Change

1 comment:

  • Commit Message:

    • Patch Set #1, Line 7: [build] Make `build_analyze_snapshot` consistent between the host and target toolchains.

    • (In this case both x64 and ARM64 Macs were affected.) […]

      I believe we have plenty of cycles on the M1 bots, they always run immediately when I add them to my CQ on CLs. (The Windows ones I'm not so sure about.)

      We would definitely catch these build configurations errors with a build-only bot 👍

To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
Gerrit-Change-Number: 280782
Gerrit-PatchSet: 1
Gerrit-Owner: Ryan Macnak <rma...@google.com>
Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
Gerrit-Attention: Ryan Macnak <rma...@google.com>
Gerrit-Comment-Date: Mon, 06 Feb 2023 17:23:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Daco Harkes <dacoh...@google.com>
Comment-In-Reply-To: Ryan Macnak <rma...@google.com>
Gerrit-MessageType: comment

Commit Queue (Gerrit)

unread,
Feb 6, 2023, 1:19:40 PM2/6/23
to Ryan Macnak, rev...@dartlang.org, vm-...@dartlang.org, Daco Harkes, CBuild

Commit Queue submitted this change.

View Change

Approvals: Daco Harkes: Looks good to me, approved Ryan Macnak: Commit
[build] Make `build_analyze_snapshot` consistent between the host and target toolchains.

Bug: https://github.com/dart-lang/sdk/issues/51242
Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280782
Reviewed-by: Daco Harkes <dacoh...@google.com>
Commit-Queue: Ryan Macnak <rma...@google.com>
---
M runtime/runtime_args.gni
1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/runtime/runtime_args.gni b/runtime/runtime_args.gni
index 0c4f1ea..b3eac69 100644
--- a/runtime/runtime_args.gni
+++ b/runtime/runtime_args.gni
@@ -92,6 +92,6 @@
# The analyze_snapshot tool is only supported on 64 bit AOT builds running
# under linux and android platforms
build_analyze_snapshot =
- (is_linux || is_android) &&
+ (target_os == "linux" || target_os == "android") &&
(dart_target_arch == "x64" || dart_target_arch == "arm64")
}

To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: sdk
Gerrit-Branch: main
Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
Gerrit-Change-Number: 280782
Gerrit-PatchSet: 2
Gerrit-Owner: Ryan Macnak <rma...@google.com>
Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
Gerrit-MessageType: merged

CBuild (Gerrit)

unread,
Feb 6, 2023, 1:58:01 PM2/6/23
to Ryan Macnak, Commit Queue, rev...@dartlang.org, vm-...@dartlang.org, Daco Harkes

go/dart-cbuild result: SUCCESS

Details: https://goto.google.com/dart-cbuild/find/881825980e7b5217a7c8cbd219970a42eb644db9

View Change

    To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

    Gerrit-Project: sdk
    Gerrit-Branch: main
    Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
    Gerrit-Change-Number: 280782
    Gerrit-PatchSet: 2
    Gerrit-Owner: Ryan Macnak <rma...@google.com>
    Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
    Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
    Gerrit-Comment-Date: Mon, 06 Feb 2023 18:57:58 +0000
    Gerrit-HasComments: No
    Gerrit-Has-Labels: No
    Gerrit-MessageType: comment

    William Hesse (Gerrit)

    unread,
    Feb 7, 2023, 8:47:28 AM2/7/23
    to Ryan Macnak, Commit Queue, rev...@dartlang.org, vm-...@dartlang.org, William Hesse, Daco Harkes, CBuild

    View Change

    1 comment:

    • Patchset:

      • Patch Set #2:

        This change seems to have broken the Fuchsia build, because the analyze_snapshot target is no longer present in the Fuchsia build.

        //third_party/dart/runtime/bin:analyze_snapshot(//build/toolchain/linux:clang_x64)

        is needed by

        //flutter/lib/snapshot:generate_snapshot_bins(//build/toolchain/fuchsia:fuchsia)

    To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

    Gerrit-Project: sdk
    Gerrit-Branch: main
    Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
    Gerrit-Change-Number: 280782
    Gerrit-PatchSet: 2
    Gerrit-Owner: Ryan Macnak <rma...@google.com>
    Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
    Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
    Gerrit-CC: William Hesse <whe...@google.com>
    Gerrit-Comment-Date: Tue, 07 Feb 2023 13:47:23 +0000
    Gerrit-HasComments: Yes
    Gerrit-Has-Labels: No
    Gerrit-MessageType: comment

    William Hesse (Gerrit)

    unread,
    Feb 7, 2023, 9:17:30 AM2/7/23
    to Ryan Macnak, Commit Queue, rev...@dartlang.org, vm-...@dartlang.org, William Hesse, Daco Harkes, CBuild

    View Change

    1 comment:

    To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

    Gerrit-Project: sdk
    Gerrit-Branch: main
    Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
    Gerrit-Change-Number: 280782
    Gerrit-PatchSet: 2
    Gerrit-Owner: Ryan Macnak <rma...@google.com>
    Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
    Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
    Gerrit-CC: William Hesse <whe...@google.com>
    Gerrit-Comment-Date: Tue, 07 Feb 2023 14:17:25 +0000
    Gerrit-HasComments: Yes
    Gerrit-Has-Labels: No
    Comment-In-Reply-To: William Hesse <whe...@google.com>
    Gerrit-MessageType: comment

    William Hesse (Gerrit)

    unread,
    Feb 7, 2023, 9:20:04 AM2/7/23
    to Ryan Macnak, Commit Queue, rev...@dartlang.org, vm-...@dartlang.org, William Hesse, Daco Harkes, CBuild

    William Hesse has created a revert of this change.

    View Change

    To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

    Gerrit-Project: sdk
    Gerrit-Branch: main
    Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
    Gerrit-Change-Number: 280782
    Gerrit-PatchSet: 2
    Gerrit-Owner: Ryan Macnak <rma...@google.com>
    Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
    Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
    Gerrit-CC: William Hesse <whe...@google.com>
    Gerrit-MessageType: revert

    Ryan Macnak (Gerrit)

    unread,
    Feb 7, 2023, 1:38:30 PM2/7/23
    to Commit Queue, rev...@dartlang.org, vm-...@dartlang.org, William Hesse, Daco Harkes, CBuild

    View Change

    1 comment:

    To view, visit change 280782. To unsubscribe, or for help writing mail filters, visit settings.

    Gerrit-Project: sdk
    Gerrit-Branch: main
    Gerrit-Change-Id: I7a0ad1f0bc94c4593412945e4887f9045693fd40
    Gerrit-Change-Number: 280782
    Gerrit-PatchSet: 2
    Gerrit-Owner: Ryan Macnak <rma...@google.com>
    Gerrit-Reviewer: Daco Harkes <dacoh...@google.com>
    Gerrit-Reviewer: Ryan Macnak <rma...@google.com>
    Gerrit-CC: William Hesse <whe...@google.com>
    Gerrit-Comment-Date: Tue, 07 Feb 2023 18:38:26 +0000
    Gerrit-HasComments: Yes
    Gerrit-Has-Labels: No
    Gerrit-MessageType: comment
    Reply all
    Reply to author
    Forward
    0 new messages