Skip to content

Commit 43944cc

Browse files
committed
Remove Y_ABSL_DONT_USE_DEBUG_LIBRARY patch
commit_hash:2239db40d79dce04bdad999a63c2878f31cd1502
1 parent 4f0653f commit 43944cc

File tree

7 files changed

+6
-152
lines changed

7 files changed

+6
-152
lines changed

contrib/restricted/abseil-cpp-tstring/.yandex_meta/__init__.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@ def subst(p):
4040
absl.ADDINCL = [subst(include) for include in absl.ADDINCL]
4141
absl.SRCS = [subst(src) for src in absl.SRCS]
4242

43-
with self.yamakes["."] as absl:
44-
absl.after(
45-
"CFLAGS",
46-
"""
47-
IF (Y_ABSL_DONT_USE_DEBUG)
48-
CFLAGS(-DY_ABSL_DONT_USE_DEBUG_LIBRARY=1)
49-
ENDIF()
50-
""",
51-
)
52-
5343

5444
abseil_cpp = CMakeNinjaNixProject(
5545
owners=["g:cpp-contrib"],

contrib/restricted/abseil-cpp-tstring/patches/disable-debug-libarary.patch

Lines changed: 0 additions & 110 deletions
This file was deleted.

contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/layout.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,11 @@ constexpr size_t Max(size_t a, size_t b, Ts... rest) {
306306
template <class T>
307307
TString TypeName() {
308308
TString out;
309+
#if Y_ABSL_INTERNAL_HAS_RTTI
310+
y_absl::StrAppend(&out, "<",
311+
y_absl::debugging_internal::DemangleString(typeid(T).name()),
312+
">");
313+
#endif
309314
return out;
310315
}
311316

contrib/restricted/abseil-cpp-tstring/y_absl/log/internal/log_message.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -585,15 +585,11 @@ void LogMessage::LogBacktraceIfNeeded() {
585585
return;
586586
OstreamView view(*data_);
587587
view.stream() << " (stacktrace:\n";
588-
#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
589588
debugging_internal::DumpStackTrace(
590589
1, log_internal::MaxFramesInLogStackTrace(),
591590
log_internal::ShouldSymbolizeLogStackTrace(), WriteToStream,
592591
&view.stream());
593592
view.stream() << ") ";
594-
#else
595-
view.stream() << "abseil disable stacktrace prining) ";
596-
#endif
597593
}
598594

599595
// Encodes into `data_->encoded_remaining()` a partial `logging.proto.Event`

contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,14 +307,9 @@ CordzInfo::CordzInfo(CordRep* rep, const CordzInfo* src,
307307
MethodIdentifier method, int64_t sampling_stride)
308308
: rep_(rep),
309309
stack_depth_(
310-
#ifdef Y_ABSL_DONT_USE_DEBUG_LIBRARY
311-
0
312-
#else
313310
static_cast<size_t>(y_absl::GetStackTrace(stack_,
314311
/*max_depth=*/kMaxStackDepth,
315-
/*skip_count=*/1))
316-
#endif
317-
),
312+
/*skip_count=*/1))),
318313
parent_stack_depth_(FillParentStack(src, parent_stack_)),
319314
method_(method),
320315
parent_method_(GetParentMethod(src)),

contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.cc

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@ static SynchEvent* GetSynchEvent(const void* addr) {
434434
// if event recording is on
435435
static void PostSynchEvent(void* obj, int ev) {
436436
SynchEvent* e = GetSynchEvent(obj);
437-
#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
438437
// logging is on if event recording is on and either there's no event struct,
439438
// or it explicitly says to log
440439
if (e == nullptr || e->log) {
@@ -456,7 +455,6 @@ static void PostSynchEvent(void* obj, int ev) {
456455
Y_ABSL_RAW_LOG(INFO, "%s%p %s %s", event_properties[ev].msg, obj,
457456
(e == nullptr ? "" : e->name), buffer);
458457
}
459-
#endif
460458
const int flags = event_properties[ev].flags;
461459
if ((flags & SYNCH_F_LCK) != 0 && e != nullptr && e->invariant != nullptr) {
462460
// Calling the invariant as is causes problems under ThreadSanitizer.
@@ -1322,7 +1320,6 @@ static inline void DebugOnlyLockLeave(Mutex* mu) {
13221320

13231321
static char* StackString(void** pcs, int n, char* buf, int maxlen,
13241322
bool symbolize) {
1325-
#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
13261323
static constexpr int kSymLen = 200;
13271324
char sym[kSymLen];
13281325
int len = 0;
@@ -1342,21 +1339,12 @@ static char* StackString(void** pcs, int n, char* buf, int maxlen,
13421339
len += strlen(&buf[len]);
13431340
}
13441341
return buf;
1345-
#else
1346-
buf[0] = 0;
1347-
return buf;
1348-
#endif
13491342
}
13501343

13511344
static char* CurrentStackString(char* buf, int maxlen, bool symbolize) {
1352-
#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
13531345
void* pcs[40];
13541346
return StackString(pcs, y_absl::GetStackTrace(pcs, Y_ABSL_ARRAYSIZE(pcs), 2), buf,
13551347
maxlen, symbolize);
1356-
#else
1357-
buf[0] = 0;
1358-
return buf;
1359-
#endif
13601348
}
13611349

13621350
namespace {
@@ -1382,11 +1370,7 @@ struct ScopedDeadlockReportBuffers {
13821370

13831371
// Helper to pass to GraphCycles::UpdateStackTrace.
13841372
int GetStack(void** stack, int max_depth) {
1385-
#ifndef Y_ABSL_DONT_USE_DEBUG_LIBRARY
13861373
return y_absl::GetStackTrace(stack, max_depth, 3);
1387-
#else
1388-
return 0;
1389-
#endif
13901374
}
13911375
} // anonymous namespace
13921376

contrib/restricted/abseil-cpp-tstring/ya.make

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ ENDIF()
2929

3030
NO_COMPILER_WARNINGS()
3131

32-
IF (Y_ABSL_DONT_USE_DEBUG)
33-
CFLAGS(
34-
-DY_ABSL_DONT_USE_DEBUG_LIBRARY=1
35-
)
36-
ENDIF()
37-
3832
SRCS(
3933
y_absl/base/internal/cycleclock.cc
4034
y_absl/base/internal/low_level_alloc.cc

0 commit comments

Comments
 (0)