Skip to content

Commit 179b67e

Browse files
committed
Revert "WebAssembly: add a ton of logging when looking up metadata"
Don't need logging anymore. This reverts commit 065ab6f61c80c2573d72e1572c751914d42f7a61.
1 parent 81d21a3 commit 179b67e

File tree

2 files changed

+3
-50
lines changed

2 files changed

+3
-50
lines changed

stdlib/public/runtime/MetadataLookup.cpp

-28
Original file line numberDiff line numberDiff line change
@@ -276,47 +276,19 @@ _findExtendedTypeContextDescriptor(const ExtensionContextDescriptor *extension,
276276
/// buildContextDescriptorMangling in MetadataReader.
277277
bool swift::_isCImportedTagType(const TypeContextDescriptor *type,
278278
const ParsedTypeIdentity &identity) {
279-
fprintf(stderr, "trying to dump type %p\n", type);
280-
fprintf(stderr, "name: %s\n", type->Name.get());
281-
fprintf(stderr, "trying to dump identity %p\n", &identity);
282-
fprintf(stderr, "User facing name: %s\n", identity.UserFacingName.str().c_str());
283-
fprintf(stderr, "ok, let's go\n");
284279
// Tag types are always imported as structs or enums.
285280
if (type->getKind() != ContextDescriptorKind::Enum &&
286281
type->getKind() != ContextDescriptorKind::Struct)
287282
return false;
288283

289-
fprintf(stderr, "is it a c typedef\n");
290-
291284
// Not a typedef imported as a nominal type.
292285
if (identity.isCTypedef())
293286
return false;
294287

295-
fprintf(stderr, "is related entity\n");
296-
297288
// Not a related entity.
298289
if (identity.isAnyRelatedEntity())
299290
return false;
300291

301-
fprintf(stderr, "is c imported context\n");
302-
fprintf(stderr, "type's parent, raw: %x\n", *((unsigned int*)&type->Parent));
303-
fprintf(stderr, "type's parent: %p\n", type->Parent.get());
304-
// fprintf(stderr, "type's parent name: %s\n", type->Parent->Name.get());
305-
fprintf(stderr, "trying to get module context\n");
306-
307-
for (auto cur = type->Parent.get(); true; cur = cur->Parent.get()) {
308-
fprintf(stderr, "cur %p\n", cur);
309-
fprintf(stderr, "cur %x\n", (unsigned int)cur->getKind());
310-
if (auto module = dyn_cast<ModuleContextDescriptor>(cur)) {
311-
fprintf(stderr, "found\n");
312-
break;
313-
}
314-
}
315-
316-
fprintf(stderr, "type's parent module context: %p\n", type->Parent->getModuleContext());
317-
fprintf(stderr, "trying to get name\n");
318-
fprintf(stderr, "type's parent module context name: %s\n", type->Parent->getModuleContext()->Name.get());
319-
320292
// Imported from C.
321293
return type->Parent->isCImportedContext();
322294
}

stdlib/public/runtime/ProtocolConformance.cpp

+3-22
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ static const ProtocolConformanceDescriptor *
545545
swift_conformsToSwiftProtocolImpl(const Metadata * const type,
546546
const ProtocolDescriptor *protocol,
547547
StringRef module) {
548-
fprintf(stderr, "in impl2\n");
549548
auto &C = Conformances.get();
550549

551550
// See if we have a cached conformance. The ConcurrentMap data structure
@@ -572,25 +571,17 @@ swift_conformsToSwiftProtocolImpl(const Metadata * const type,
572571
C.cacheFailure(type, protocol, snapshot.count());
573572
return nullptr;
574573
}
575-
fprintf(stderr, "got to really scan\n");
574+
576575
// Really scan conformance records.
577576
for (size_t i = startIndex; i < endIndex; i++) {
578-
fprintf(stderr, "index = %lx\n", (unsigned long)i);
579577
auto &section = snapshot.Start[i];
580578
// Eagerly pull records for nondependent witnesses into our cache.
581579
for (const auto &record : section) {
582-
fprintf(stderr, "got a record\n");
583-
auto descriptorPtr = record.get();
584-
auto &descriptor = *descriptorPtr;
585-
fprintf(stderr, "got the descriptor: %p\n", descriptorPtr);
586-
fprintf(stderr, "got the protocol: %p\n", descriptor.getProtocol());
587-
descriptor.getProtocol()->dump();
588-
fprintf(stderr, "got it\n");
580+
auto &descriptor = *record.get();
589581

590582
// We only care about conformances for this protocol.
591583
if (descriptor.getProtocol() != protocol)
592584
continue;
593-
fprintf(stderr, "about to get matching type\n");
594585

595586
// If there's a matching type, record the positive result.
596587
ConformanceCandidate candidate(descriptor);
@@ -605,7 +596,6 @@ swift_conformsToSwiftProtocolImpl(const Metadata * const type,
605596
}
606597

607598
// Conformance scan is complete.
608-
fprintf(stderr, "about to update cache\n");
609599

610600
// Search the cache once more, and this time update the cache if necessary.
611601
FoundConformance = searchInConformanceCache(type, protocol);
@@ -620,21 +610,12 @@ swift_conformsToSwiftProtocolImpl(const Metadata * const type,
620610
static const WitnessTable *
621611
swift_conformsToProtocolImpl(const Metadata * const type,
622612
const ProtocolDescriptor *protocol) {
623-
// WebAssembly: logging pls
624-
fprintf(stderr, "swift_conformsToProtocolImpl: %p %p\n", type, protocol);
625-
protocol->dump();
626-
fprintf(stderr, "trying to dump the type now\n");
627-
type->dump();
628-
fprintf(stderr, "dumped the type\n");
629-
// end WebAssembly
630613
auto description =
631614
swift_conformsToSwiftProtocol(type, protocol, StringRef());
632615
if (!description)
633616
return nullptr;
634-
description->getProtocol()->dump();
635617

636-
auto retval = description->getWitnessTable(type);
637-
return retval;
618+
return description->getWitnessTable(type);
638619
}
639620

640621
const ContextDescriptor *

0 commit comments

Comments
 (0)