shield in caller instead

Author: krlmlr

inst/include/Rcpp/exceptions.h

@@ -31,12 +31,12 @@ namespace Rcpp {
         explicit exception(const char* message_, bool include_call = true) :	// #nocov start
             message(message_),
             include_call_(include_call){
-            rcpp_set_stack_trace(stack_trace());
+            rcpp_set_stack_trace(Shield<SEXP>(stack_trace()));
         }
         exception(const char* message_, const char* file, int line, bool include_call = true) :
             message(message_),
             include_call_(include_call){
-            rcpp_set_stack_trace(stack_trace(file,line));
+            rcpp_set_stack_trace(Shield<SEXP>(stack_trace()));
         }
         bool include_call() const {
             return include_call_;

src/barrier.cpp

@@ -121,7 +121,6 @@ SEXP rcpp_get_stack_trace() {
 
 // [[Rcpp::register]]
 SEXP rcpp_set_stack_trace(SEXP e) {
-    Rcpp::Shield<SEXP> ep(e);
     SET_VECTOR_ELT(get_rcpp_cache(), 3, e);
     return R_NilValue;
 }