Skip to content

Commit

Permalink
Fix bug accessing [0] of an empty container, closes #895
Browse files Browse the repository at this point in the history
  • Loading branch information
@hsutter
hsutter committed Dec 20, 2023
1 parent 0827bab commit 62027b2
Show file tree
Hide file tree
Showing 13 changed files with 105 additions and 94 deletions.
9 changes: 8 additions & 1 deletion include/cpp2util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,14 @@ auto assert_in_bounds_impl(auto&& x, auto&& arg CPP2_SOURCE_LOCATION_PARAM_WITH_
if constexpr (std::is_signed_v<CPP2_TYPEOF(arg)>) { return std::ssize(x); }
else { return std::size(x); }
};
Bounds.expects(0 <= arg && arg < max(), ("out of bounds access attempt detected - attempted index " + std::to_string(arg) + ", [min,max] range is [0," + std::to_string(max()-1) + "]").c_str() CPP2_SOURCE_LOCATION_ARG);
auto msg = "out of bounds access attempt detected - attempted access at index " + std::to_string(arg) + ", ";
if (max() > 0 ) {
msg += "[min,max] range is [0," + std::to_string(max()-1) + "]";
}
else {
msg += "but container is empty";
}
Bounds.expects(0 <= arg && arg < max(), msg.c_str() CPP2_SOURCE_LOCATION_ARG);
}

auto assert_in_bounds_impl(auto&&, auto&& CPP2_SOURCE_LOCATION_PARAM_WITH_DEFAULT) -> void
Expand Down
2 changes: 1 addition & 1 deletion regression-tests/test-results/clang-12/mixed-bounds-check.cpp.execution
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Bounds safety violation: out of bounds access attempt detected - attempted index 5, [min,max] range is [0,4]
Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
52 changes: 26 additions & 26 deletions regression-tests/test-results/clang-12/mixed-bugfix-for-ufcs-non-local.cpp.output
View file
Original file line number Diff line number Diff line change
@@ -1,118 +1,118 @@
mixed-bugfix-for-ufcs-non-local.cpp2:13:12: error: a lambda expression cannot appear in this context
template<t<CPP2_UFCS_NONLOCAL(f)(o)> _> bool inline constexpr v0 = false;// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:15:3: error: a lambda expression cannot appear in this context
t<CPP2_UFCS_NONLOCAL(f)(o)> inline constexpr v1 = t<true>();// Fails on Clang 12 (lambda in unevaluated context).
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: error: a lambda expression cannot appear in this context
template<t<CPP2_UFCS_NONLOCAL(f)(o)> _> auto g() -> void;
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:23:36: error: a lambda expression cannot appear in this context
auto g([[maybe_unused]] cpp2::in<t<CPP2_UFCS_NONLOCAL(f)(o)>> unnamed_param_1) -> void;
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:27:29: error: a lambda expression cannot appear in this context
[[nodiscard]] auto h() -> t<CPP2_UFCS_NONLOCAL(f)(o)>;
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:31:12: error: a lambda expression cannot appear in this context
template<t<CPP2_UFCS_NONLOCAL(f)(o)> _> using a = bool;// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:33:12: error: a lambda expression cannot appear in this context
template<t<CPP2_UFCS_NONLOCAL(f)(o)> _> auto inline constexpr b = false;// Fails on GCC ([GCC109781][]).
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:35:13: error: a lambda expression cannot appear in this context
using c = t<CPP2_UFCS_NONLOCAL(f)(o)>;// Fails on Clang 12 (lambda in unevaluated context) and Clang 12 (a lambda expression cannot appear in this context)
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:37:29: error: a lambda expression cannot appear in this context
auto inline constexpr d = t<CPP2_UFCS_NONLOCAL(f)(o)>();// Fails on Clang 12 (lambda in unevaluated context).
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: error: a lambda expression cannot appear in this context
template<t<CPP2_UFCS_NONLOCAL(f)(o)> _> auto g() -> void{}// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:23:36: error: a lambda expression cannot appear in this context
auto g([[maybe_unused]] cpp2::in<t<CPP2_UFCS_NONLOCAL(f)(o)>> unnamed_param_1) -> void{}// Fails on Clang 12 (lambda in unevaluated context).
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:27:29: error: a lambda expression cannot appear in this context
[[nodiscard]] auto h() -> t<CPP2_UFCS_NONLOCAL(f)(o)> { return o; }// Fails on Clang 12 (lambda in unevaluated context).
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
mixed-bugfix-for-ufcs-non-local.cpp2:41:79: error: lambda expression in an unevaluated operand
inline CPP2_CONSTEXPR bool u::c = [](cpp2::in<std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(f)(o))>> x) mutable -> auto { return x; }(true);// Fails on Clang 12 (lambda in unevaluated context).
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
13 errors generated.
4 changes: 2 additions & 2 deletions regression-tests/test-results/clang-12/pure2-bugfix-for-ufcs-noexcept.cpp.output
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pure2-bugfix-for-ufcs-noexcept.cpp2:5:26: error: lambda expression in an unevaluated operand
static_assert(noexcept(CPP2_UFCS(swap)(t(), t())));// Fails on Clang 12 (lambda in unevaluated context) and GCC 10 (static assertion failed)
^
../../../include/cpp2util.h:860:59: note: expanded from macro 'CPP2_UFCS'
../../../include/cpp2util.h:867:59: note: expanded from macro 'CPP2_UFCS'
#define CPP2_UFCS(...) CPP2_UFCS_(&,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
1 error generated.
8 changes: 4 additions & 4 deletions regression-tests/test-results/clang-12/pure2-bugfix-for-ufcs-sfinae.cpp.output
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand
template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>;
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand
template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>{}// Fails on Clang 12 (lambda in unevaluated context).
^
../../../include/cpp2util.h:863:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
../../../include/cpp2util.h:870:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
^
../../../include/cpp2util.h:844:53: note: expanded from macro 'CPP2_UFCS_'
../../../include/cpp2util.h:851:53: note: expanded from macro 'CPP2_UFCS_'
#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
^
2 errors generated.
2 changes: 1 addition & 1 deletion regression-tests/test-results/gcc-10/mixed-bounds-check.cpp.execution
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Bounds safety violation: out of bounds access attempt detected - attempted index 5, [min,max] range is [0,4]
Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
2 changes: 1 addition & 1 deletion regression-tests/test-results/gcc-13/mixed-bounds-check.cpp.execution
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Bounds safety violation: out of bounds access attempt detected - attempted index 5, [min,max] range is [0,4]
Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
40 changes: 20 additions & 20 deletions regression-tests/test-results/gcc-13/mixed-bugfix-for-ufcs-non-local.cpp.output
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
In file included from mixed-bugfix-for-ufcs-non-local.cpp:6:
../../../include/cpp2util.h:845:1: error: lambda-expression in template parameter type
845 | [LAMBDADEFCAPT]< \
../../../include/cpp2util.h:852:1: error: lambda-expression in template parameter type
852 | [LAMBDADEFCAPT]< \
| ^
../../../include/cpp2util.h:863:59: note: in expansion of macro ‘CPP2_UFCS_’
863 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
../../../include/cpp2util.h:870:59: note: in expansion of macro ‘CPP2_UFCS_’
870 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
| ^~~~~~~~~~
mixed-bugfix-for-ufcs-non-local.cpp2:13:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
mixed-bugfix-for-ufcs-non-local.cpp2:13:36: error: template argument 1 is invalid
../../../include/cpp2util.h:845:1: error: lambda-expression in template parameter type
845 | [LAMBDADEFCAPT]< \
../../../include/cpp2util.h:852:1: error: lambda-expression in template parameter type
852 | [LAMBDADEFCAPT]< \
| ^
../../../include/cpp2util.h:863:59: note: in expansion of macro ‘CPP2_UFCS_’
863 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
../../../include/cpp2util.h:870:59: note: in expansion of macro ‘CPP2_UFCS_’
870 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
| ^~~~~~~~~~
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
../../../include/cpp2util.h:845:1: error: lambda-expression in template parameter type
845 | [LAMBDADEFCAPT]< \
../../../include/cpp2util.h:852:1: error: lambda-expression in template parameter type
852 | [LAMBDADEFCAPT]< \
| ^
../../../include/cpp2util.h:863:59: note: in expansion of macro ‘CPP2_UFCS_’
863 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
../../../include/cpp2util.h:870:59: note: in expansion of macro ‘CPP2_UFCS_’
870 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
| ^~~~~~~~~~
mixed-bugfix-for-ufcs-non-local.cpp2:31:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
mixed-bugfix-for-ufcs-non-local.cpp2:31:36: error: template argument 1 is invalid
../../../include/cpp2util.h:845:1: error: lambda-expression in template parameter type
845 | [LAMBDADEFCAPT]< \
../../../include/cpp2util.h:852:1: error: lambda-expression in template parameter type
852 | [LAMBDADEFCAPT]< \
| ^
../../../include/cpp2util.h:863:59: note: in expansion of macro ‘CPP2_UFCS_’
863 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
../../../include/cpp2util.h:870:59: note: in expansion of macro ‘CPP2_UFCS_’
870 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
| ^~~~~~~~~~
mixed-bugfix-for-ufcs-non-local.cpp2:33:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
mixed-bugfix-for-ufcs-non-local.cpp2:33:36: error: template argument 1 is invalid
../../../include/cpp2util.h:845:1: error: lambda-expression in template parameter type
845 | [LAMBDADEFCAPT]< \
../../../include/cpp2util.h:852:1: error: lambda-expression in template parameter type
852 | [LAMBDADEFCAPT]< \
| ^
../../../include/cpp2util.h:863:59: note: in expansion of macro ‘CPP2_UFCS_’
863 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
../../../include/cpp2util.h:870:59: note: in expansion of macro ‘CPP2_UFCS_’
870 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)
| ^~~~~~~~~~
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
2 changes: 1 addition & 1 deletion regression-tests/test-results/msvc-2022/mixed-bounds-check.cpp.execution
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Bounds safety violation: out of bounds access attempt detected - attempted index 5, [min,max] range is [0,4]
Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
2 changes: 1 addition & 1 deletion regression-tests/test-results/version
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

cppfront compiler v0.3.0 Build 8C19:1603
cppfront compiler v0.3.0 Build 8C19:1617
Copyright(c) Herb Sutter All rights reserved

SPDX-License-Identifier: CC-BY-NC-ND-4.0
Expand Down
2 changes: 1 addition & 1 deletion source/build.info
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"8C19:1603"
"8C19:1617"
Loading

0 comments on commit 62027b2

Please sign in to comment.