Skip to content

Commit 12b9e31

Browse files
alexmarkovCommit Queue
authored andcommitted
[vm] Fix gcc build
The following error is fixed: FAILED: obj/runtime/vm/libdart_jit.dart_api_impl.o x86_64-linux-gnu-g++ -MMD -MF obj/runtime/vm/libdart_jit.dart_api_impl.o.d -D_FORTIFY_SOURCE=2 -DDEBUG -DTARGET_ARCH_X64 -DSUPPORT_PERFETTO -DDART_TARGET_OS_LINUX -DDART_SHARED_LIB -I../../runtime -I../.. -Igen -I../../runtime/include -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -m64 -march=x86-64 -msse2 -fPIE -Wall -Wextra -Werror -Wendif-labels -Wno-missing-field-initializers -Wno-unused-parameter -Wno-ignored-qualifiers -fdebug-prefix-map=/b/s/w/ir/cache/builder/sdk/= -no-canonical-prefixes -fvisibility=hidden -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -O2 -fdata-sections -ffunction-sections -g3 -ggdb3 -Wno-unused-parameter -Wno-unused-private-field -Wnon-virtual-dtor -Wvla -Woverloaded-virtual -Wno-comments -g3 -ggdb3 -fno-rtti -fno-exceptions -Wno-cast-function-type -Wno-dangling-reference -O2 -fvisibility-inlines-hidden -fno-omit-frame-pointer -std=c++20 -std=c++20 -fno-rtti -c ../../runtime/vm/dart_api_impl.cc -o obj/runtime/vm/libdart_jit.dart_api_impl.o In file included from ../../runtime/vm/type_testing_stubs.h:12, from ../../runtime/vm/image_snapshot.h:22, from ../../runtime/vm/dwarf.h:11, from ../../runtime/vm/dart_api_impl.cc:25: ../../runtime/vm/compiler/backend/il.h:10093:23: error: declaration of ‘const dart::RuntimeEntry& dart::TsanReadWriteInstr::RuntimeEntry() const’ changes meaning of ‘RuntimeEntry’ [-Wchanges-meaning] 10093 | const RuntimeEntry& RuntimeEntry() const; | ^~~~~~~~~~~~ ../../runtime/vm/compiler/backend/il.h:10093:9: note: used here to mean ‘class dart::RuntimeEntry’ 10093 | const RuntimeEntry& RuntimeEntry() const; | ^~~~~~~~~~~~ In file included from ../../runtime/vm/compiler/jit/compiler.h:11, from ../../runtime/vm/dart_api_impl.cc:18: ../../runtime/vm/runtime_entry.h:28:7: note: declared here 28 | class RuntimeEntry : public BaseRuntimeEntry { | ^~~~~~~~~~~~ TEST=ci Change-Id: I8130ee8cc8c5f1bd9940c27a88c6cbcf9a9e49a6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/446682 Commit-Queue: Alexander Markov <[email protected]> Reviewed-by: Ryan Macnak <[email protected]>
1 parent c5fd0e0 commit 12b9e31

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

runtime/vm/compiler/backend/il.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7293,7 +7293,7 @@ LocationSummary* TsanReadWriteInstr::MakeLocationSummary(Zone* zone,
72937293
return result;
72947294
}
72957295

7296-
const RuntimeEntry& TsanReadWriteInstr::RuntimeEntry() const {
7296+
const RuntimeEntry& TsanReadWriteInstr::GetRuntimeEntry() const {
72977297
intptr_t size = RepresentationUtils::ValueSize(slot().representation());
72987298
if (kind_ == Kind::kRead) {
72997299
switch (size) {
@@ -7352,7 +7352,7 @@ void TsanReadWriteInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
73527352
intptr_t tag = slot().has_untagged_instance() ? 0 : kHeapObjectTag;
73537353
__ AddImmediate(CallingConventions::ArgumentRegisters[0], instance_reg,
73547354
slot().offset_in_bytes() - tag);
7355-
__ Load(TMP, compiler::Address(THR, RuntimeEntry().OffsetFromThread()));
7355+
__ Load(TMP, compiler::Address(THR, GetRuntimeEntry().OffsetFromThread()));
73567356
__ Store(TMP,
73577357
compiler::Address(THR, compiler::target::Thread::vm_tag_offset()));
73587358
__ CallCFunction(TMP);

runtime/vm/compiler/backend/il.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10090,7 +10090,7 @@ class TsanReadWriteInstr : public TemplateInstruction<1, NoThrow> {
1009010090
FIELD_LIST)
1009110091
#undef FIELD_LIST
1009210092

10093-
const RuntimeEntry& RuntimeEntry() const;
10093+
const RuntimeEntry& GetRuntimeEntry() const;
1009410094

1009510095
private:
1009610096
DISALLOW_COPY_AND_ASSIGN(TsanReadWriteInstr);

0 commit comments

Comments
 (0)