Depend on Rcpp 0.12.17.3 so that we can benefit from RcppCore/Rcpp#868 …

…and remove the calls from Rcpp exceptions. closes #3662
tidyverse · Aug 6, 2018 · f159817 · f159817
1 parent 9584596
commit f159817
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -24,7 +24,7 @@ Imports:
     methods,
     pkgconfig (>= 2.0.1),
     R6 (>= 2.2.2),
-    Rcpp (>= 0.12.15),
+    Rcpp (>= 0.12.17.3),
     rlang (>= 0.2.0.9001),
     tibble (>= 1.3.1),
     tidyselect (>= 0.2.3),
@@ -63,3 +63,4 @@ Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate"))
 RoxygenNote: 6.0.1.9000
 Remotes:
     tidyverse/rlang
+    RcppCore/Rcpp
diff --git a/inst/include/dplyr_RcppExports.h b/inst/include/dplyr_RcppExports.h
@@ -39,6 +39,8 @@ namespace dplyr {
         }
         if (rcpp_result_gen.inherits("interrupted-error"))
             throw Rcpp::internal::InterruptedException();
+        if (Rcpp::internal::isLongjumpSentinel(rcpp_result_gen))
+            throw Rcpp::internal::LongjumpException(rcpp_result_gen);
         if (rcpp_result_gen.inherits("try-error"))
             throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
         return Rcpp::as<SEXP >(rcpp_result_gen);
@@ -58,6 +60,8 @@ namespace dplyr {
         }
         if (rcpp_result_gen.inherits("interrupted-error"))
             throw Rcpp::internal::InterruptedException();
+        if (Rcpp::internal::isLongjumpSentinel(rcpp_result_gen))
+            throw Rcpp::internal::LongjumpException(rcpp_result_gen);
         if (rcpp_result_gen.inherits("try-error"))
             throw Rcpp::exception(Rcpp::as<std::string>(rcpp_result_gen).c_str());
         return Rcpp::as<SEXP >(rcpp_result_gen);

diff --git a/src/Makevars b/src/Makevars
@@ -1,2 +1,2 @@
 # Disable long types from C99 or CPP11 extensions
-PKG_CPPFLAGS = -I../inst/include -DCOMPILING_DPLYR -DBOOST_NO_INT64_T -DBOOST_NO_INTEGRAL_INT64_T -DBOOST_NO_LONG_LONG -DRCPP_USING_UTF8_ERROR_STRING
+PKG_CPPFLAGS = -I../inst/include -DRCPP_DEFAULT_INCLUDE_CALL=false -DCOMPILING_DPLYR -DBOOST_NO_INT64_T -DBOOST_NO_INTEGRAL_INT64_T -DBOOST_NO_LONG_LONG -DRCPP_USING_UTF8_ERROR_STRING
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1 +1 @@
-PKG_CPPFLAGS = -I../inst/include -DCOMPILING_DPLYR -DRCPP_USING_UTF8_ERROR_STRING
+PKG_CPPFLAGS = -I../inst/include -DRCPP_DEFAULT_INCLUDE_CALL=false -DCOMPILING_DPLYR -DRCPP_USING_UTF8_ERROR_STRING
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -280,6 +280,10 @@ RcppExport SEXP _dplyr_get_date_classes() {
         UNPROTECT(1);
         Rf_onintr();
     }
+    bool rcpp_isLongjump_gen = Rcpp::internal::isLongjumpSentinel(rcpp_result_gen);
+    if (rcpp_isLongjump_gen) {
+        Rcpp::internal::resumeJump(rcpp_result_gen);
+    }
     Rboolean rcpp_isError_gen = Rf_inherits(rcpp_result_gen, "try-error");
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
@@ -309,6 +313,10 @@ RcppExport SEXP _dplyr_get_time_classes() {
         UNPROTECT(1);
         Rf_onintr();
     }
+    bool rcpp_isLongjump_gen = Rcpp::internal::isLongjumpSentinel(rcpp_result_gen);
+    if (rcpp_isLongjump_gen) {
+        Rcpp::internal::resumeJump(rcpp_result_gen);
+    }
     Rboolean rcpp_isError_gen = Rf_inherits(rcpp_result_gen, "try-error");
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);

diff --git a/tests/testthat/test-mutate.r b/tests/testthat/test-mutate.r
@@ -820,3 +820,21 @@ test_that("grouped subsets are not lazy (#3360)", {
 
   expect_identical(res, list(make_call("a"), make_call("b")))
 })
+
+test_that("errors don't have tracebacks (#3662)", {
+  tryCatch(
+    mutate(tibble(x=1:10) %>% mutate(z=y)),
+    error = function(e){
+      expect_match(conditionMessage(e), "object 'y' not found")
+      expect_null(conditionCall(e))
+    }
+  )
+
+  tryCatch(
+    n_distinct(),
+    error = function(e){
+      expect_equal(conditionMessage(e), "Need at least one column for `n_distinct()`")
+      expect_null(conditionCall(e))
+    }
+  )
+})