vasilito
cb424d7448
verify-patch-sanity.py validates every active recipe .patch has internally- consistent hunk line counts — catching the 'malformed patch at line N' failure at commit/CI/preflight time instead of hours into a cook. This cycle hit that class three times (qtwaylandscanner, sddm, xwayland), each only discovered when cookbook tried to apply the patch. Running it across the repo found 29 latent malformed patches (validated against GNU patch: e.g. relibc/P3-sysv-ipc reproduces 'malformed patch at line 22'). They were harmless only because they sit in vendored recipes (baked, not re- applied) — but would fail on any version-bump re-derivation. --fix recounts the hunk headers (body untouched) and repaired all 29. Wired into build-preflight.sh (Phase 1.0D) and redbear-ci.yml, with a unit test (test-patch-sanity.sh). Skips archived/legacy trees and unvalidatable formats (empty placeholders, bare-@@ git hunks).
124 lines
5.3 KiB
C++
124 lines
5.3 KiB
C++
// RUN: rm -rf %t
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -DTEXTUAL
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -DTEXTUAL
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -DTEXTUAL -DEARLY_INDIRECT_INCLUDE
|
|
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -fmodule-feature use_defs_twice -DIMPORT_USE_2
|
|
|
|
// Trigger import of definitions, but don't make them visible.
|
|
#include "empty.h"
|
|
#ifdef EARLY_INDIRECT_INCLUDE
|
|
#include "indirect.h"
|
|
// expected-warning@defs.h:28 3{{anonymous non-C-compatible type}}
|
|
// expected-note@defs.h:28 6{{type is}}
|
|
#endif
|
|
|
|
A pre_a;
|
|
// expected-error-re@-1 {{missing '#include "{{.*}}-defs.h"'; 'A' must be declared}}
|
|
// expected-note@defs.h:1 +{{here}}
|
|
extern class A pre_a2;
|
|
int pre_use_a = use_a(pre_a2); // expected-error 2{{'A' must be defined}} expected-error {{'use_a' must be declared}}
|
|
// expected-note@defs.h:2 +{{here}}
|
|
|
|
B::Inner2 pre_bi; // expected-error +{{must be declared}} expected-error +{{must be defined}}
|
|
// expected-note@defs.h:4 +{{here}}
|
|
// expected-note@defs.h:17 +{{here}}
|
|
void pre_bfi(B b) { // expected-error +{{must be declared}}
|
|
b.f<int>();
|
|
}
|
|
|
|
C_Base<1> pre_cb1; // expected-error +{{must be declared}} expected-error +{{must be defined}}
|
|
// expected-note@defs.h:23 +{{here}}
|
|
C1 pre_c1; // expected-error +{{must be declared}}
|
|
// expected-note@defs.h:25 +{{here}}
|
|
C2 pre_c2; // expected-error +{{must be declared}}
|
|
// expected-note@defs.h:26 +{{here}}
|
|
|
|
D::X pre_dx; // expected-error +{{must be declared}} expected-error +{{must be defined}}
|
|
// expected-note@defs.h:28 +{{here}}
|
|
// expected-note@defs.h:29 +{{here}}
|
|
int pre_use_dx = use_dx(pre_dx); // ignored; pre_dx is invalid
|
|
|
|
int pre_e = E(0); // expected-error {{must be declared}}
|
|
// expected-note@defs.h:32 +{{here}}
|
|
|
|
int pre_ff = F<int>().f(); // expected-error +{{must be declared}}
|
|
int pre_fg = F<int>().g<int>(); // expected-error +{{must be declared}}
|
|
// expected-note@defs.h:34 +{{here}}
|
|
|
|
G::A pre_ga // expected-error +{{must be declared}}
|
|
= G::a; // expected-error +{{must be declared}}
|
|
// expected-note@defs.h:50 +{{here}}
|
|
decltype(G::h) pre_gh = G::h; // expected-error +{{must be declared}} expected-error +{{must be defined}}
|
|
// expected-note@defs.h:51 +{{here}}
|
|
|
|
int pre_h = H(); // expected-error +{{must be declared}}
|
|
// expected-note@defs.h:56 +{{here}}
|
|
using pre_i = I<>; // expected-error +{{must be declared}} expected-error +{{default argument of 'I' must be defined}}
|
|
// expected-note@defs.h:57 +{{here}}
|
|
|
|
J<> pre_j; // expected-error {{'J' must be declared}}
|
|
// expected-error-re@-1 {{missing '#include "{{.*}}.h"'; default argument of 'J' must be defined before it is used}}
|
|
// expected-note@defs.h:58 +{{here}}
|
|
|
|
ScopedEnum pre_scopedenum; // expected-error {{must be declared}}
|
|
// expected-note@defs.h:105 0-1{{here}}
|
|
// expected-note@defs.h:106 0-1{{here}}
|
|
enum ScopedEnum : int;
|
|
ScopedEnum pre_scopedenum_declared; // ok
|
|
|
|
// Make definitions from second module visible.
|
|
#ifdef TEXTUAL
|
|
#include "import-and-redefine.h"
|
|
#elif defined IMPORT_USE_2
|
|
#include "use-defs-2.h"
|
|
#else
|
|
#include "merged-defs.h"
|
|
#endif
|
|
|
|
A post_a;
|
|
int post_use_a = use_a(post_a);
|
|
B::Inner2 post_bi;
|
|
void post_bfi(B b) {
|
|
b.f<int>();
|
|
}
|
|
C_Base<1> post_cb1;
|
|
C1 c1;
|
|
C2 c2;
|
|
D::X post_dx;
|
|
int post_use_dx = use_dx(post_dx);
|
|
int post_e = E(0);
|
|
int post_ff = F<char>().f();
|
|
int post_fg = F<char>().g<int>();
|
|
G::A post_ga = G::a;
|
|
decltype(G::h) post_gh = G::h;
|
|
int post_h = H();
|
|
using post_i = I<>;
|
|
J<> post_j;
|
|
template<typename T, int N, template<typename> class K> struct J;
|
|
J<> post_j2;
|
|
FriendDefArg::Y<int> friend_def_arg;
|
|
FriendDefArg::D<> friend_def_arg_d;
|
|
int post_anon_x_n = Anon::X().n;
|
|
|
|
MergeFunctionTemplateSpecializations::X<int>::Q<char> xiqc;
|
|
|
|
#ifdef TEXTUAL
|
|
#include "use-defs.h"
|
|
void use_static_inline() { StaticInline::g({}); }
|
|
#ifdef EARLY_INDIRECT_INCLUDE
|
|
// expected-warning@-2 {{ambiguous use of internal linkage declaration 'g' defined in multiple modules}}
|
|
// expected-note@defs.h:71 {{declared here in module 'redef'}}
|
|
// expected-note@defs.h:71 {{declared here in module 'stuff.use'}}
|
|
#endif
|
|
int use_anon_enum = G::g;
|
|
#ifdef EARLY_INDIRECT_INCLUDE
|
|
// expected-warning@-2 3{{ambiguous use of internal linkage declaration 'g' defined in multiple modules}}
|
|
// FIXME: These notes are produced, but -verify can't match them?
|
|
// FIXME-note@defs.h:51 3{{declared here in module 'redef'}}
|
|
// FIXME-note@defs.h:51 3{{declared here in module 'stuff.use'}}
|
|
#endif
|
|
int use_named_enum = G::i;
|
|
#endif
|