Skip to content

Commit ee95732

Browse files
committed
[Test] Ensourced is-deinit-barrier.
Moved the test next to the code it calls.
1 parent ec120e4 commit ee95732

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

lib/SILOptimizer/Analysis/BasicCalleeAnalysis.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
#include "swift/SIL/MemAccessUtils.h"
1919
#include "swift/SIL/SILBridging.h"
2020
#include "swift/SIL/SILModule.h"
21+
#include "swift/SIL/Test.h"
2122
#include "swift/SILOptimizer/OptimizerBridging.h"
23+
#include "swift/SILOptimizer/PassManager/Transforms.h"
2224
#include "swift/SILOptimizer/Utils/InstOptUtils.h"
2325
#include "llvm/Support/Compiler.h"
2426

@@ -370,3 +372,21 @@ bool swift::isDeinitBarrier(SILInstruction *const instruction,
370372
BridgedCalleeAnalysis analysis = {bca};
371373
return instructionIsDeinitBarrierFunction(inst, analysis);
372374
}
375+
376+
namespace swift::test {
377+
// Arguments:
378+
// - instruction
379+
// Dumps:
380+
// - instruction
381+
// - whether it's a deinit barrier
382+
static FunctionTest IsDeinitBarrierTest("is-deinit-barrier", [](auto &function,
383+
auto &arguments,
384+
auto &test) {
385+
auto *instruction = arguments.takeInstruction();
386+
auto *analysis = test.template getAnalysis<BasicCalleeAnalysis>();
387+
auto isBarrier = isDeinitBarrier(instruction, analysis);
388+
instruction->dump();
389+
auto *boolString = isBarrier ? "true" : "false";
390+
llvm::errs() << boolString << "\n";
391+
});
392+
} // namespace swift::test

lib/SILOptimizer/UtilityPasses/TestRunner.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -311,22 +311,6 @@ static FunctionTest FieldSensitiveMultiDefUseLiveRangeTest(
311311
boundary.print(llvm::errs());
312312
});
313313

314-
// Arguments:
315-
// - instruction
316-
// Dumps:
317-
// - instruction
318-
// - whether it's a deinit barrier
319-
static FunctionTest IsDeinitBarrierTest("is-deinit-barrier", [](auto &function,
320-
auto &arguments,
321-
auto &test) {
322-
auto *instruction = arguments.takeInstruction();
323-
auto *analysis = test.template getAnalysis<BasicCalleeAnalysis>();
324-
auto isBarrier = isDeinitBarrier(instruction, analysis);
325-
instruction->dump();
326-
auto *boolString = isBarrier ? "true" : "false";
327-
llvm::errs() << boolString << "\n";
328-
});
329-
330314
// Arguments:
331315
// - value
332316
// Dumps:

0 commit comments

Comments
 (0)