Skip to content

Commit 30be570

Browse files
authored
Merge pull request #38 from apple/master
[pull] swiftwasm from apple:master
2 parents 7d2aa8f + d6b9d84 commit 30be570

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

Diff for: include/swift/AST/AnyRequest.h

+4
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ class AnyRequestBase {
145145
AnyRequestBase(const AnyRequestBase &other) {
146146
vtableAndKind = other.vtableAndKind;
147147
}
148+
AnyRequestBase &operator=(const AnyRequestBase &other) {
149+
vtableAndKind = other.vtableAndKind;
150+
return *this;
151+
}
148152

149153
private:
150154
Derived &asDerived() {

Diff for: test/Sanitizers/scudo.swift

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// RUN: not %target-run %t_scudo-binary 2>&1 | %FileCheck %s
33
// REQUIRES: executable_test
44
// REQUIRES: OS=linux-gnu
5+
// REQUIRES: scudo_runtime
56

67
let allocated = UnsafeMutableRawPointer.allocate(byteCount: 128, alignment: 1)
78
allocated.deallocate()

Diff for: test/lit.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -1535,6 +1535,7 @@ runtime_libs = {
15351535
'profile': 'profile_runtime',
15361536
'asan': 'asan_runtime',
15371537
'ubsan': 'ubsan_runtime',
1538+
'scudo': 'scudo_runtime',
15381539
'safestack': 'safestack_runtime',
15391540
'fuzzer': 'fuzzer_runtime'
15401541
}

0 commit comments

Comments
 (0)