diff options
| author | Araq <rumpf_a@web.de> | 2018-06-08 19:50:36 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-06-08 19:50:36 +0200 |
| commit | 8e9551b1c7614029f12e7d62ba81f367d1aaf6bd (patch) | |
| tree | 6aaa97a9734784ab5a65d1d2975100e4dd9872d1 /compiler/ccgcalls.nim | |
| parent | 8ba7e7d807c37a0988abd69ef9824b4822fe04f3 (diff) | |
| parent | f99acdb07584d2c4c5eb1f22d998d97bcd823357 (diff) | |
| download | Nim-8e9551b1c7614029f12e7d62ba81f367d1aaf6bd.tar.gz | |
fixex merge conflicts
Diffstat (limited to 'compiler/ccgcalls.nim')
| -rw-r--r-- | compiler/ccgcalls.nim | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/ccgcalls.nim b/compiler/ccgcalls.nim index 43a9f570a..2f9cc822b 100644 --- a/compiler/ccgcalls.nim +++ b/compiler/ccgcalls.nim @@ -83,7 +83,7 @@ proc isInCurrentFrame(p: BProc, n: PNode): bool = result = isInCurrentFrame(p, n.sons[0]) else: discard -proc genIndexCheck(p: BProc; arr, idx: TLoc) +proc genBoundsCheck(p: BProc; arr, a, b: TLoc) proc openArrayLoc(p: BProc, n: PNode): Rope = var a: TLoc @@ -97,8 +97,7 @@ proc openArrayLoc(p: BProc, n: PNode): Rope = initLocExpr(p, q[3], c) # but first produce the required index checks: if optBoundsCheck in p.options: - genIndexCheck(p, a, b) - genIndexCheck(p, a, c) + genBoundsCheck(p, a, b, c) let ty = skipTypes(a.t, abstractVar+{tyPtr}) case ty.kind of tyArray: |