Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "Roll src/third_party/dart 24725a8559..28f95fcd24 (32 commits)" #9817

Merged
bkonyi merged 1 commit into from
Jul 12, 2019
Merged

Revert "Roll src/third_party/dart 24725a8559..28f95fcd24 (32 commits)" #9817

bkonyi merged 1 commit into from
Jul 12, 2019

Conversation

@bkonyi
Copy link
Contributor

@bkonyi bkonyi commented Jul 12, 2019

Reverts #9812

@bkonyi
Copy link
Contributor Author

bkonyi commented Jul 12, 2019

iOS build failure:

FAILED: obj/third_party/dart/runtime/vm/compiler/libdart_vm_jit.ffi.o 
/b/s/w/ir/cache/goma/client/gomacc  ../../buildtools/mac-x64/clang/bin/clang++ -MMD -MF obj/third_party/dart/runtime/vm/compiler/libdart_vm_jit.ffi.o.d -DNO_TCMALLOC -DMEMORY_TOOL_REPLACES_ALLOCATOR -DMEMORY_SANITIZER_INITIAL_SIZE -DTOOLCHAIN_VERSION=bac220c15490dcf7b7d8136f75100bbc77e8d217 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DTARGET_ARCH_DBC -DUSING_SIMULATOR -DNDEBUG -DTARGET_OS_MACOS -DTARGET_OS_MACOS_IOS -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -I../../third_party/dart/runtime -I../.. -Igen -I../../third_party/dart/runtime/include -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -isysroot /b/s/w/ir/cache/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk -miphoneos-version-min=8.0   -fno-strict-aliasing -arch armv7 -fno-aligned-allocation -fcolor-diagnostics -Wall -Wextra -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wunguarded-availability -fvisibility=hidden -stdlib=libc++ -Wheader-hygiene -Wstring-conversion -Wthread-safety -Os -fno-ident -fdata-sections -ffunction-sections -g2 -Werror -Wall -Wextra -Wno-unused-parameter -Wno-unused-private-field -Wnon-virtual-dtor -Wvla -Wno-conversion-null -Woverloaded-virtual -Wno-comments -g3 -ggdb3 -fno-rtti -fno-exceptions -Wimplicit-fallthrough -O3 -fvisibility-inlines-hidden -std=c++17 -fno-rtti -fno-exceptions  -c ../../third_party/dart/runtime/vm/compiler/ffi.cc -o obj/third_party/dart/runtime/vm/compiler/libdart_vm_jit.ffi.o
../../third_party/dart/runtime/vm/compiler/ffi.cc:66:1: error: static_assert failed "FFI transformation alignment"
static_assert(alignof(double) == 8, "FFI transformation alignment");
^             ~~~~~~~~~~~~~~~~~~~~
../../third_party/dart/runtime/vm/compiler/ffi.cc:67:1: error: static_assert failed "FFI transformation alignment"
static_assert(alignof(uint64_t) == 8, "FFI transformation alignment");
^             ~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.

cc/ @dcharkes, can you please test your changes locally by building the iOS Flutter engine before landing FFI changes? The Dart buildbot and autoroller doesn't have any way to test iOS builds, so we won't discover them until we try and roll into the Flutter engine.

@bkonyi bkonyi merged commit 8abe85b into master Jul 12, 2019
@bkonyi bkonyi deleted the revert-9812-dart-sdk-roll-2019-07-12 branch July 12, 2019 22:08
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 12, 2019
@engine-flutter-autoroll
8abe85b Revert "Roll src/third_party/dart 24725a8559..28f95fcd24 (32 …
dc7556f 
…commits)" (flutter/engine#9817)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jul 12, 2019
Closed
@dcharkes dcharkes mentioned this pull request Jul 15, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 15, 2019
@engine-flutter-autoroll
8abe85b Revert "Roll src/third_party/dart 24725a8559..28f95fcd24 (32 …
bddc261 
…commits)" (flutter/engine#9817)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jul 15, 2019
Merged
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Jul 15, 2019
@engine-flutter-autoroll
Roll engine 919e353..76a91d3 (7 commits) (#36203)
b6ce64a 
flutter/engine@919e353...76a91d3

git log 919e353..76a91d3 --no-merges --oneline
76a91d3 Roll src/third_party/skia 8590026dbf0d..563d044c0e76 (38 commits) (flutter/engine#9824)
8143845 Roll fuchsia/sdk/core/mac-amd64 from olF8ZjlM3lWSmWq8XyfXTKoPveuZtTcrGJINk_ERHhwC to pU_n3ahOhH6HJhE4vs5pUR8cg5U22TItP_Ds_N2OXPIC (flutter/engine#9820)
379028a Add the functionality to merge and unmerge MessageLoopTaskQueues (flutter/engine#9436)
8abe85b Revert "Roll src/third_party/dart 24725a8559..28f95fcd24 (32 commits)" (flutter/engine#9817)
96746bc Roll src/third_party/skia c3f28e3cf0d4..8590026dbf0d (2 commits) (flutter/engine#9805)
3652a68 Roll fuchsia/sdk/core/mac-amd64 from CDbRdGJ3bu-aWMCZqN5VzfQqIBwDGL2wfFodWABKdCIC to olF8ZjlM3lWSmWq8XyfXTKoPveuZtTcrGJINk_ERHhwC (flutter/engine#9803)
67d284d Roll src/third_party/dart 24725a8559..28f95fcd24 (32 commits)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff (garyq@google.com), and stop
the roller if necessary.
johnsonmh pushed a commit to johnsonmh/flutter that referenced this pull request Jul 30, 2019
@engine-flutter-autoroll @johnsonmh
Roll engine 919e353..76a91d3 (7 commits) (flutter#36203)
f6ea163 
flutter/engine@919e353...76a91d3

git log 919e353..76a91d3 --no-merges --oneline
76a91d3 Roll src/third_party/skia 8590026dbf0d..563d044c0e76 (38 commits) (flutter/engine#9824)
8143845 Roll fuchsia/sdk/core/mac-amd64 from olF8ZjlM3lWSmWq8XyfXTKoPveuZtTcrGJINk_ERHhwC to pU_n3ahOhH6HJhE4vs5pUR8cg5U22TItP_Ds_N2OXPIC (flutter/engine#9820)
379028a Add the functionality to merge and unmerge MessageLoopTaskQueues (flutter/engine#9436)
8abe85b Revert &flutter#34;Roll src/third_party/dart 24725a8559..28f95fcd24 (32 commits)&flutter#34; (flutter/engine#9817)
96746bc Roll src/third_party/skia c3f28e3cf0d4..8590026dbf0d (2 commits) (flutter/engine#9805)
3652a68 Roll fuchsia/sdk/core/mac-amd64 from CDbRdGJ3bu-aWMCZqN5VzfQqIBwDGL2wfFodWABKdCIC to olF8ZjlM3lWSmWq8XyfXTKoPveuZtTcrGJINk_ERHhwC (flutter/engine#9803)
67d284d Roll src/third_party/dart 24725a8559..28f95fcd24 (32 commits)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff (garyq@google.com), and stop
the roller if necessary.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@bkonyi @googlebot