-
-
Notifications
You must be signed in to change notification settings - Fork 219
Fixes exception call stack for C++ exceptions #582
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6afcd4f
Fixes exception call stack for C++ exceptions
jimhester 1f7c623
Remove unnecessary backticks
jimhester bb82bd9
Match the Rcpp_eval tryCatch(eval(sys.call(), ...)) call explicitly
jimhester 9412f1f
Move the check to an internal function
jimhester 65e502d
Mark is_Rcpp_eval_call inline
jimhester 4331513
Add tests
jimhester 8e41c81
Add print and format methods for Rcpp_stack_trace
jimhester e366353
Put internal functions in the Rcpp namespace
jimhester File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- | ||
| // | ||
| // dates.cpp: Rcpp R/C++ interface class library -- Date + Datetime tests | ||
| // | ||
| // Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois | ||
| // | ||
| // This file is part of Rcpp. | ||
| // | ||
| // Rcpp is free software: you can redistribute it and/or modify it | ||
| // under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 2 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // Rcpp is distributed in the hope that it will be useful, but | ||
| // WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Rcpp. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| #include <Rcpp.h> | ||
| using namespace Rcpp; | ||
|
|
||
| // [[Rcpp::export]] | ||
| double takeLog(double val) { | ||
| if (val <= 0.0) { | ||
| throw std::range_error("Inadmissible value"); | ||
| } | ||
| return log(val); | ||
| } | ||
|
|
||
| // [[Rcpp::export]] | ||
| double takeLogRcpp(double val) { | ||
| if (val <= 0.0) { | ||
| throw Rcpp::exception("Inadmissible value"); | ||
| } | ||
| return log(val); | ||
| } | ||
|
|
||
| // [[Rcpp::export]] | ||
| double takeLogRcppLocation(double val) { | ||
| if (val <= 0.0) { | ||
| throw Rcpp::exception("Inadmissible value", "exceptions.cpp", 44); | ||
| } | ||
| return log(val); | ||
| } | ||
|
|
||
| double f1(double val) { | ||
| return takeLogRcppLocation(val); | ||
| } | ||
|
|
||
| // [[Rcpp::export]] | ||
| double takeLogNested(double val) { | ||
| return f1(val); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| #!/usr/bin/env r | ||
| # -*- mode: R; tab-width: 4; -*- | ||
| # | ||
| # Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois | ||
| # | ||
| # This file is part of Rcpp. | ||
| # | ||
| # Rcpp is free software: you can redistribute it and/or modify it | ||
| # under the terms of the GNU General Public License as published by | ||
| # the Free Software Foundation, either version 2 of the License, or | ||
| # (at your option) any later version. | ||
| # | ||
| # Rcpp is distributed in the hope that it will be useful, but | ||
| # WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with Rcpp. If not, see <http://www.gnu.org/licenses/>. | ||
| .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes" | ||
|
|
||
| if (.runThisTest) { | ||
| .setUp <- Rcpp:::unitTestSetup("exceptions.cpp") | ||
|
|
||
| test.stdException <- function() { | ||
|
|
||
| # Code works normally without an exception | ||
| checkIdentical(takeLog(1L), log(1L)) | ||
|
|
||
| # C++ exceptions are converted to R conditions | ||
| condition <- tryCatch(takeLog(-1L), error = identity) | ||
|
|
||
| checkIdentical(condition$message, "Inadmissible value") | ||
| checkIdentical(class(condition), c("std::range_error", "C++Error", "error", "condition")) | ||
|
|
||
| # C++ stack only available for Rcpp::exceptions | ||
| checkTrue(is.null(condition$cppstack)) | ||
|
|
||
| checkIdentical(condition$call, quote(takeLog(-1L))) | ||
| } | ||
|
|
||
|
|
||
| test.rcppException <- function() { | ||
|
|
||
| # Code works normally without an exception | ||
| checkIdentical(takeLog(1L), log(1L)) | ||
|
|
||
| # C++ exceptions are converted to R conditions | ||
| condition <- tryCatch(takeLogRcpp(-1L), error = identity) | ||
|
|
||
| checkIdentical(condition$message, "Inadmissible value") | ||
| checkIdentical(class(condition), c("Rcpp::exception", "C++Error", "error", "condition")) | ||
|
|
||
| checkTrue(!is.null(condition$cppstack)) | ||
|
|
||
| checkIdentical(class(condition$cppstack), "Rcpp_stack_trace") | ||
|
|
||
| checkEquals(condition$call, quote(takeLogRcpp(-1L))) | ||
| } | ||
|
|
||
| test.rcppExceptionLocation <- function() { | ||
|
|
||
| # Code works normally without an exception | ||
| checkIdentical(takeLog(1L), log(1L)) | ||
|
|
||
| # C++ exceptions are converted to R conditions | ||
| condition <- tryCatch(takeLogRcppLocation(-1L), error = identity) | ||
|
|
||
| checkIdentical(condition$message, "Inadmissible value") | ||
| checkIdentical(class(condition), c("Rcpp::exception", "C++Error", "error", "condition")) | ||
|
|
||
| checkTrue(!is.null(condition$cppstack)) | ||
| checkIdentical(class(condition$cppstack), "Rcpp_stack_trace") | ||
|
|
||
| checkIdentical(condition$cppstack$file, "exceptions.cpp") | ||
| checkIdentical(condition$cppstack$line, 44L) | ||
|
|
||
| checkEquals(condition$call, quote(takeLogRcppLocation(-1L))) | ||
| } | ||
|
|
||
| test.rcppExceptionLocation <- function() { | ||
|
|
||
| # Nested exceptions work the same way | ||
| normal <- tryCatch(takeLogRcppLocation(-1L), error = identity) | ||
| f1 <- function(x) takeLogNested(x) | ||
|
|
||
| nested <- tryCatch(f1(-1), error = identity) | ||
|
|
||
| # Message the same | ||
| checkIdentical(normal$message, nested$message) | ||
|
|
||
| checkEquals(nested$call, quote(takeLogNested(x))) | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this accidentally was left outside of the outer
namespace Rcppbombing compilation:https://travis-ci.org/RcppCore/Rcpp#L2618