Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/SILGen/SILGenExpr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2059,10 +2059,10 @@ RValue RValueEmitter::visitAnyHashableErasureExpr(AnyHashableErasureExpr *E,
auto sourceOrigType = AbstractionPattern::getOpaque();
auto subExpr = E->getSubExpr();
auto &sourceOrigTL = SGF.getTypeLowering(sourceOrigType, subExpr->getType());
auto source =
SGF.silConv.useLoweredAddresses()
? SGF.emitMaterializedRValueAsOrig(subExpr, sourceOrigType)
: SGF.emitRValueAsOrig(subExpr, sourceOrigType, sourceOrigTL, C);
auto source = SGF.silConv.useLoweredAddresses()
? SGF.emitMaterializedRValueAsOrig(subExpr, sourceOrigType)
: SGF.emitRValueAsOrig(subExpr, sourceOrigType,
sourceOrigTL, SGFContext());

return SGF.emitAnyHashableErasure(E, source, subExpr->getType(),
E->getConformance(), C);
Expand Down
22 changes: 22 additions & 0 deletions test/SILGen/opaque_values_silgen.swift
Original file line number Diff line number Diff line change
Expand Up @@ -760,3 +760,25 @@ func callMutatingFooOnInoutExistential(_ i: inout any MutatingFooable) {
struct WeakBox<T : AnyObject> {
weak var t: T?
}

// CHECK-LABEL: sil {{.*}}[ossa] @intIntoAnyHashableVar : {{.*}} {
// CHECK: [[VAR_BOX_ADDR:%[^,]+]] = project_box
// CHECK: [[INT:%[^,]+]] = apply
// CHECK: [[CONVERT:%[^,]+]] = function_ref @$ss21_convertToAnyHashableys0cD0VxSHRzlF
// CHECK: [[INSTANCE:%[^,]+]] = apply [[CONVERT]]<Int>([[INT]])
// CHECK: store [[INSTANCE]] to [init] [[VAR_BOX_ADDR]]
// CHECK-LABEL: } // end sil function 'intIntoAnyHashableVar'
@_silgen_name("intIntoAnyHashableVar")
func intIntoAnyHashableVar() {
var anyHashable: AnyHashable = 0
}

// CHECK-LABEL: sil {{.*}}[ossa] @intIntoAnyHashableLet : {{.*}} {
// CHECK: [[INT:%[^,]+]] = apply
// CHECK: [[CONVERT:%[^,]+]] = function_ref @$ss21_convertToAnyHashableys0cD0VxSHRzlF
// CHECK: [[INSTANCE:%[^,]+]] = apply [[CONVERT]]<Int>([[INT]])
// CHECK-LABEL: } // end sil function 'intIntoAnyHashableLet'
@_silgen_name("intIntoAnyHashableLet")
func intIntoAnyHashableLet() {
let anyHashable: AnyHashable = 0
}