Blame yosys-empty-label.patch
|
 |
e24c927 |
From 6732e566321b828c83b563d24a10ac31c6d03e28 Mon Sep 17 00:00:00 2001
|
|
|
e24c927 |
From: Jon Burgess <jburgess777@gmail.com>
|
|
|
e24c927 |
Date: Sun, 28 Oct 2018 14:49:09 +0000
|
|
|
e24c927 |
Subject: [PATCH] Avoid assert when label is an empty string
|
|
|
e24c927 |
|
|
|
e24c927 |
Calling back() on an empty string is not allowed and triggers
|
|
|
e24c927 |
an assert with recent gcc:
|
|
|
e24c927 |
|
|
|
e24c927 |
$ cd manual/PRESENTATION_Intro
|
|
|
e24c927 |
$ ../../yosys counter.ys
|
|
|
e24c927 |
...
|
|
|
e24c927 |
/usr/include/c++/8/bits/basic_string.h:1136: std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::reference std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::back() [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>; std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::reference = char&]: Assertion '!empty()' failed.
|
|
|
e24c927 |
|
|
|
e24c927 |
802 if (label.back() == ':' && GetSize(label) > 1)
|
|
|
e24c927 |
(gdb) p label
|
|
|
e24c927 |
$1 = ""
|
|
|
e24c927 |
---
|
|
|
e24c927 |
kernel/yosys.cc | 2 +-
|
|
|
e24c927 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
e24c927 |
|
|
|
e24c927 |
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
|
|
|
e24c927 |
index 21eeadaa..f002955a 100644
|
|
|
e24c927 |
--- a/kernel/yosys.cc
|
|
|
e24c927 |
+++ b/kernel/yosys.cc
|
|
|
e24c927 |
@@ -799,7 +799,7 @@ static void handle_label(std::string &command, bool &from_to_active, const std::
|
|
|
e24c927 |
while (pos < GetSize(command) && command[pos] != ' ' && command[pos] != '\t' && command[pos] != '\r' && command[pos] != '\n')
|
|
|
e24c927 |
label += command[pos++];
|
|
|
e24c927 |
|
|
|
e24c927 |
- if (label.back() == ':' && GetSize(label) > 1)
|
|
|
e24c927 |
+ if (GetSize(label) > 1 && label.back() == ':')
|
|
|
e24c927 |
{
|
|
|
e24c927 |
label = label.substr(0, GetSize(label)-1);
|
|
|
e24c927 |
command = command.substr(pos);
|
|
|
e24c927 |
--
|
|
|
e24c927 |
2.17.2
|
|
|
e24c927 |
|