diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2020-08-11 14:50:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 14:50:46 +0200 |
| commit | 813f16a2a39f1375b241cf50845f641ea44d890e (patch) | |
| tree | a5c45d5ead15167ded8d9d9dcef87dbf52013a38 /compiler/sigmatch.nim | |
| parent | 963db9e7dac39f4238f013addfae36439318b67f (diff) | |
| parent | b022576ce96f5c166c7f5684bef9de682704cb1b (diff) | |
| download | Nim-813f16a2a39f1375b241cf50845f641ea44d890e.tar.gz | |
Fix #8473 (#15169)
* Make explicit {.nimcall.} a seperate calling convention
* Add testcase for #5688
* Fix bootstrapping
* Remove little lies :)
* Use typeflag insteadDiffstat (limited to 'compiler/sigmatch.nim')
| -rw-r--r-- | compiler/sigmatch.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim index 7d97944ce..786cca01f 100644 --- a/compiler/sigmatch.nim +++ b/compiler/sigmatch.nim @@ -639,7 +639,7 @@ proc procTypeRel(c: var TCandidate, f, a: PType): TTypeRelation = return isNone elif f.callConv != a.callConv: # valid to pass a 'nimcall' thingie to 'closure': - if f.callConv == ccClosure and a.callConv == ccDefault: + if f.callConv == ccClosure and a.callConv == ccNimCall: result = if result == isInferred: isInferredConvertible elif result == isBothMetaConvertible: isBothMetaConvertible else: isConvertible |