Fix tests

Author: elsteveogrande

libcxx/src/stacktrace/trace.cpp

@@ -39,7 +39,7 @@ _LIBCPP_EXPORTED_FROM_ABI ostream& _Trace::write_to(std::ostream& __os) const {
 
       // printf-style format to a small buffer, to avoid messing with stream (with `setw` etc.)
       char index_str[21];
-      snprintf(index_str, sizeof(index_str), "%3lu", __i + 1);
+      snprintf(index_str, sizeof(index_str), "%3zu", __i + 1);
       __os << "  frame " << index_str << ": " << entry;
     }
   }

libcxx/test/std/diagnostics/stacktrace/basic.cmp/equality.pass.cpp

@@ -21,9 +21,9 @@
 
 // Call chain is: main -> c -> b -> a -> stacktrace::current;
 // we're only checking a, b, c in the returned stacktrace, so use max_depth of 3.
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace a(size_t skip = 0) { return std::stacktrace::current(skip, 3); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace b(size_t skip = 0) { return a(skip); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace c(size_t skip = 0) { return b(skip); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace a(size_t skip = 0) { return std::stacktrace::current(skip, 3); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace b(size_t skip = 0) { return a(skip); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace c(size_t skip = 0) { return b(skip); }
 
 int main(int, char**) {
   std::stacktrace st0;

libcxx/test/std/diagnostics/stacktrace/basic.cmp/strong_ordering.pass.cpp

@@ -21,6 +21,7 @@
 #include <cassert>
 #include <cstdint>
 #include <stacktrace>
+#include <vector>
 
 namespace {
 
@@ -40,22 +41,20 @@ std::stacktrace fake_trace(std::vector<uintptr_t> const& addrs) {
 } // namespace
 
 int main(int, char**) {
-  using vec = std::vector<uintptr_t>;
-
   auto lt = std::strong_ordering::less;
   auto eq = std::strong_ordering::equal;
   auto gt = std::strong_ordering::greater;
 
-  assert(lt == (fake_trace(vec{}) <=> fake_trace(vec{100})));
-  assert(lt == (fake_trace(vec{99}) <=> fake_trace(vec{100})));
-  assert(lt == (fake_trace(vec{100}) <=> fake_trace(vec{100, 200})));
+  assert(lt == (fake_trace({}) <=> fake_trace({100})));
+  assert(lt == (fake_trace({99}) <=> fake_trace({100})));
+  assert(lt == (fake_trace({100}) <=> fake_trace({100, 200})));
 
-  assert(eq == (fake_trace(vec{}) <=> fake_trace(vec{})));
-  assert(eq == (fake_trace(vec{100}) <=> fake_trace(vec{100})));
+  assert(eq == (fake_trace({}) <=> fake_trace({})));
+  assert(eq == (fake_trace({100}) <=> fake_trace({100})));
 
-  assert(gt == (fake_trace(vec{100}) <=> fake_trace(vec{})));
-  assert(gt == (fake_trace(vec{100}) <=> fake_trace(vec{99})));
-  assert(gt == (fake_trace(vec{100, 200}) <=> fake_trace(vec{100})));
+  assert(gt == (fake_trace({100}) <=> fake_trace({})));
+  assert(gt == (fake_trace({100}) <=> fake_trace({99})));
+  assert(gt == (fake_trace({100, 200}) <=> fake_trace({100})));
 
   return 0;
 }

libcxx/test/std/diagnostics/stacktrace/basic.cons/current.hardening.cpp renamed to libcxx/test/std/diagnostics/stacktrace/basic.cons/assert.current.pass.cpp

@@ -27,20 +27,22 @@
 #include <cassert>
 #include <cstdint>
 #include <stacktrace>
+#include <vector>
+
 #include "test_macros.h"
 
 // These let us produce dummy functions with distinct addresses to build test stacks.
 // `main` calls `c`, which calls `b`, which calls `a`, which calls `current`;
 // therefore the stacktrace built in `a` should contain, starting at the top,
 // `a`, `b`, `c` (followed by `main`, `_start` on some platforms, and so on).
 
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace a(size_t skip = 0, size_t max_depth = 99) {
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace a(size_t skip = 0, size_t max_depth = 99) {
   return std::stacktrace::current(skip, max_depth);
 }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace b(size_t skip = 0, size_t max_depth = 99) {
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace b(size_t skip = 0, size_t max_depth = 99) {
   return a(skip, max_depth);
 }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace c(size_t skip = 0, size_t max_depth = 99) {
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace c(size_t skip = 0, size_t max_depth = 99) {
   return b(skip, max_depth);
 }
 
@@ -60,8 +62,6 @@ void expect_trace(const std::stacktrace& st, std::vector<uintptr_t> const& expec
 }
 
 int main(int, char**) {
-  using vec = std::vector<uintptr_t>;
-
   // All overloads are noexcept
   static_assert(noexcept(std::stacktrace::current()));
   static_assert(noexcept(std::stacktrace::current({})));
@@ -72,17 +72,17 @@ int main(int, char**) {
   // skip == 0 yields top frames a, b, c (we ignore other frames).
   // skip removes that many top frames; max_depth caps the number of frames returned.
 
-  expect_trace(c(0, 3), vec{_a, _b, _c});
-  expect_trace(c(0, 2), vec{_a, _b});
-  expect_trace(c(0, 1), vec{_a});
-  expect_trace(c(0, 0), vec{});
+  expect_trace(c(0, 3), {_a, _b, _c});
+  expect_trace(c(0, 2), {_a, _b});
+  expect_trace(c(0, 1), {_a});
+  expect_trace(c(0, 0), {});
 
-  expect_trace(c(1, 2), vec{_b, _c});
-  expect_trace(c(1, 1), vec{_b});
-  expect_trace(c(1, 0), vec{});
+  expect_trace(c(1, 2), {_b, _c});
+  expect_trace(c(1, 1), {_b});
+  expect_trace(c(1, 0), {});
 
-  expect_trace(c(2, 1), vec{_c});
-  expect_trace(c(2, 0), vec{});
+  expect_trace(c(2, 1), {_c});
+  expect_trace(c(2, 0), {});
 
   return 0;
 }

libcxx/test/std/diagnostics/stacktrace/basic.cons/current.pass.cpp

@@ -18,9 +18,9 @@
 #include "test_macros.h"
 
 // Call chain is: main -> c -> b -> a -> stacktrace::current
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace a() { return std::stacktrace::current(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace b() { return a(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace c() { return b(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace a() { return std::stacktrace::current(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace b() { return a(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace c() { return b(); }
 
 int main(int, char**) {
   auto const st = c();

libcxx/test/std/diagnostics/stacktrace/basic.obs/at.pass.cpp

@@ -20,9 +20,9 @@
 #include "test_macros.h"
 
 // Call chain is: main -> c -> b -> a -> stacktrace::current
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace a() { return std::stacktrace::current(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace b() { return a(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace c() { return b(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace a() { return std::stacktrace::current(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace b() { return a(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace c() { return b(); }
 
 int main(int, char**) {
   {

libcxx/test/std/diagnostics/stacktrace/basic.obs/begin_end.pass.cpp

@@ -20,9 +20,9 @@
 #include "test_macros.h"
 
 // Call chain is: main -> c -> b -> a -> stacktrace::current
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace a() { return std::stacktrace::current(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace b() { return a(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace c() { return b(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace a() { return std::stacktrace::current(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace b() { return a(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace c() { return b(); }
 
 int main(int, char**) {
   {

libcxx/test/std/diagnostics/stacktrace/basic.obs/cbegin_cend.pass.cpp

@@ -20,9 +20,9 @@
 #include "test_macros.h"
 
 // Call chain is: main -> c -> b -> a -> stacktrace::current
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace a() { return std::stacktrace::current(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace b() { return a(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace c() { return b(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace a() { return std::stacktrace::current(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace b() { return a(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace c() { return b(); }
 
 int main(int, char**) {
   {

libcxx/test/std/diagnostics/stacktrace/basic.obs/crbegin_crend.pass.cpp

@@ -20,9 +20,9 @@
 #include "test_macros.h"
 
 // Call chain is: main -> c -> b -> a -> stacktrace::current
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace a() { return std::stacktrace::current(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace b() { return a(); }
-TEST_NOINLINE TEST_NO_TAIL_CALLS std::stacktrace c() { return b(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace a() { return std::stacktrace::current(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace b() { return a(); }
+TEST_NO_TAIL_CALLS TEST_NOINLINE std::stacktrace c() { return b(); }
 
 int main(int, char**) {
   std::stacktrace st;