This is an archive of the discontinued LLVM Phabricator instance.

Differential D147764

Fix the two gmoules-prefered-name-* tests
ClosedPublic

Authored by yozhu on Apr 6 2023, 10:32 PM.

Details

Reviewers
smeenai
Michael137
dblaikie
aprantl
chapuni
Commits
rG53d8b59307d4: Fix the two gmoules-prefered-name-* tests
Summary

Add missing "REQUIRES: asserts" for the two tests added in commit
711a64412749ae73709562b591ab1609a3ee7751 (Diff: D145803).

Diff Detail

Event Timeline

yozhu created this revision.Apr 6 2023, 10:32 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 6 2023, 10:32 PM
yozhu requested review of this revision.Apr 6 2023, 10:32 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 6 2023, 10:32 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
yozhu added a reviewer: smeenai.Apr 6 2023, 10:32 PM
smeenai added reviewers: Michael137, dblaikie, aprantl.Apr 6 2023, 10:34 PM

Thanks! I'm not super familiar with this, so I'm adding the original author and reviewers to confirm.

chapuni accepted this revision.Apr 6 2023, 10:43 PM
chapuni added a subscriber: chapuni.

It's obvious.

I think it was bad just to swallow stderr there.

This revision is now accepted and ready to land.Apr 6 2023, 10:43 PM
chapuni added a comment.Apr 6 2023, 11:03 PM

FYI it's netter to mention diff id like D145803 rather than commit hash, as far as is is based on the diff.

yozhu added a comment.Apr 6 2023, 11:05 PM
In D147764#4250636, @chapuni wrote:

FYI it's netter to mention diff id like D145803 rather than commit hash, as far as is is based on the diff.

Yes, will include diff ID in commit message.

yozhu edited the summary of this revision. (Show Details)Apr 6 2023, 11:08 PM
Harbormaster completed remote builds in B224163: Diff 511614.Apr 6 2023, 11:25 PM
chapuni added a comment.Apr 7 2023, 12:03 AM

This is an obvious fix and builds are still broken. Go ahead.

This revision was landed with ongoing or failed builds.Apr 7 2023, 12:12 AM
Closed by commit rG53d8b59307d4: Fix the two gmoules-prefered-name-* tests (authored by yozhu). · Explain Why
This revision was automatically updated to reflect the committed changes.
yozhu added a commit: rG53d8b59307d4: Fix the two gmoules-prefered-name-* tests.
Michael137 added a comment.Apr 7 2023, 2:39 AM

Thanks for fixing!

Revision Contents

Diff 511626

clang/test/Modules/gmodules-preferred-name-alias.cpp

// REQUIRES: asserts
// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: %clang_cc1 -std=c++11 -dwarf-ext-refs -fmodule-format=obj \ // RUN: %clang_cc1 -std=c++11 -dwarf-ext-refs -fmodule-format=obj \
// RUN: -fmodule-map-file=%S/Inputs/gmodules-preferred-name-alias.modulemap \ // RUN: -fmodule-map-file=%S/Inputs/gmodules-preferred-name-alias.modulemap \
// RUN: -fmodules-cache-path=%t -debug-info-kind=standalone -debugger-tuning=lldb \ // RUN: -fmodules-cache-path=%t -debug-info-kind=standalone -debugger-tuning=lldb \
// RUN: -fmodules -mllvm -debug-only=pchcontainer -x c++ \ // RUN: -fmodules -mllvm -debug-only=pchcontainer -x c++ \
// RUN: -I %S/Inputs %s &> %t.ll // RUN: -I %S/Inputs %s &> %t.ll
// RUN: cat %t.ll | FileCheck %s // RUN: cat %t.ll | FileCheck %s
#include "gmodules-preferred-name-alias.h" #include "gmodules-preferred-name-alias.h"
// CHECK: ![[#]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Bar<char>", scope: ![[#]], file: ![[#]], line: [[#]], baseType: ![[PREF_BASE:[0-9]+]]) // CHECK: ![[#]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Bar<char>", scope: ![[#]], file: ![[#]], line: [[#]], baseType: ![[PREF_BASE:[0-9]+]])
// CHECK: ![[PREF_BASE]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo<char>" // CHECK: ![[PREF_BASE]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo<char>"

clang/test/Modules/gmodules-preferred-name-typedef.cpp

// REQUIRES: asserts
// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: %clang_cc1 -std=c++11 -dwarf-ext-refs -fmodule-format=obj \ // RUN: %clang_cc1 -std=c++11 -dwarf-ext-refs -fmodule-format=obj \
// RUN: -fmodule-map-file=%S/Inputs/gmodules-preferred-name-typedef.modulemap \ // RUN: -fmodule-map-file=%S/Inputs/gmodules-preferred-name-typedef.modulemap \
// RUN: -fmodules-cache-path=%t -debug-info-kind=standalone -debugger-tuning=lldb \ // RUN: -fmodules-cache-path=%t -debug-info-kind=standalone -debugger-tuning=lldb \
// RUN: -fmodules -mllvm -debug-only=pchcontainer -x c++ \ // RUN: -fmodules -mllvm -debug-only=pchcontainer -x c++ \
// RUN: -I %S/Inputs %s &> %t.ll // RUN: -I %S/Inputs %s &> %t.ll
// RUN: cat %t.ll | FileCheck %s // RUN: cat %t.ll | FileCheck %s
#include "gmodules-preferred-name-typedef.h" #include "gmodules-preferred-name-typedef.h"
// CHECK: ![[#]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Bar", scope: ![[#]], file: ![[#]], line: [[#]], baseType: ![[PREF_BASE:[0-9]+]]) // CHECK: ![[#]] = !DIDerivedType(tag: DW_TAG_typedef, name: "Bar", scope: ![[#]], file: ![[#]], line: [[#]], baseType: ![[PREF_BASE:[0-9]+]])
// CHECK: ![[PREF_BASE]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo<char>" // CHECK: ![[PREF_BASE]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo<char>"