1 files changed, 13 insertions, 4 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index c5c86ba8f05..37da0858ab4 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #include "syntax.h"
 #include "window.h"
+#include "puresize.h"
 
 /* Work around GCC bug 54561.  */
 #if GNUC_PREREQ (4, 3, 0)
@@ -1409,15 +1410,23 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 
         CASE (Bsetcar):
           {
-            Lisp_Object v1 = POP;
-            TOP = Fsetcar (TOP, v1);
+            Lisp_Object newval = POP;
+            Lisp_Object cell = TOP;
+            CHECK_CONS (cell);
+            CHECK_IMPURE (cell, XCONS (cell));
+            XSETCAR (cell, newval);
+            TOP = newval;
             NEXT;
           }
 
         CASE (Bsetcdr):
           {
-            Lisp_Object v1 = POP;
-            TOP = Fsetcdr (TOP, v1);
+            Lisp_Object newval = POP;
+            Lisp_Object cell = TOP;
+            CHECK_CONS (cell);
+            CHECK_IMPURE (cell, XCONS (cell));
+            XSETCDR (cell, newval);
+            TOP = newval;
             NEXT;
           }