From 6f5a61b5fb66987a32c25e3877f4f99e37ff067d Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Sun, 2 Feb 2020 02:39:53 +0900
Subject: [PATCH] Use `next_point` to avoid ICE

---
 src/librustc_parse/parser/mod.rs      |   4 ++--
 src/test/ui/parser/issue-68730.rs     | Bin 0 -> 170 bytes
 src/test/ui/parser/issue-68730.stderr | Bin 0 -> 957 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/test/ui/parser/issue-68730.rs
 create mode 100644 src/test/ui/parser/issue-68730.stderr

diff --git a/src/librustc_parse/parser/mod.rs b/src/librustc_parse/parser/mod.rs
index 4a9016394d2..7246bf307ac 100644
--- a/src/librustc_parse/parser/mod.rs
+++ b/src/librustc_parse/parser/mod.rs
@@ -671,12 +671,12 @@ impl<'a> Parser<'a> {
                 true
             }
             token::BinOp(token::Shl) => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
+                let span = self.sess.source_map().next_point(self.token.span);
                 self.bump_with(token::Lt, span);
                 true
             }
             token::LArrow => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
+                let span = self.sess.source_map().next_point(self.token.span);
                 self.bump_with(token::BinOp(token::Minus), span);
                 true
             }
diff --git a/src/test/ui/parser/issue-68730.rs b/src/test/ui/parser/issue-68730.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b570e9417751b01f67db9a2e4edfa7631400b8d9
GIT binary patch
literal 170
zcmdPbSIA7y%P&gREy+x&)GaAW%*@HmOV`ayEzil!OD*Qo*H=g_D#|a?El4aWNiE8=
zQYg*K&dV>)Qz$M;EGkjRPg5w#&rZ$5qA<0hAT_xpHANvmFBPON!7f2ZAt5<Guec;Z
zM<FvMHLoNyEi<)9M<KsRAty5}wInk)RYxH$zcepJA;Bhriz_v+G?yVYm*I5N=_UYE
CUOdA9

literal 0
HcmV?d00001

diff --git a/src/test/ui/parser/issue-68730.stderr b/src/test/ui/parser/issue-68730.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5f9ed56e2d7e9fe3fb822cc5a40648bf6b146dd6
GIT binary patch
literal 957
zcmYc-D#|aiQYg*K&dV>)Qz$M;EGkjRPg5w#&rZ#=Qiv(7HmK!NP|(%2Q&4g74ARdm
zE-p>gHM1}`Hqa|7wlcLc<x)^ksNwSQQK(T!%`44iNX=z9-E_JMEUW+maa>#!+hPGW
z4xcRw3Pjmslx&3GKbAz<1om@AYEFTbLTFxQa(+sxLUKl8QDSmQYLSBa=_Yjr4d48f
z%(TqZA_bq+5|F4*YFdecV^L9lc}8ktil#zNetvebLQZCOs)D+Wx`KvJYH_h{NJe6w
zLU3k!o~DjMQfY}oW{E;(u|i&c2^Lq`AO|wFyl-fL#U|AFQ~=pE7y{sQlMUFhphO13
zhy;*YQIMKklA5BBpO*?s%?Wl1ItmHN`FX`92|5ayDXDoS;JDFI$S+dJ$xKTv$;?gF
zQAo=#%}Y^8ut~t1;tdVKw&G8W3JP%wWVr&KSrU`-i%K%{(iKulQx!_`6-*Thic-rm
O^Gk~rz}cyoiwgi^$0bkz

literal 0
HcmV?d00001