aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-02-09 10:50:18 +0100
committerBjörn Gustavsson <[email protected]>2011-02-09 10:50:18 +0100
commitc694c0be5656bda37fafdef858a82c76bdcf8f14 (patch)
tree1f19d8f680da5228767f544f150b4a44ecaf5b41 /erts/emulator
parent7b7409702272dd26ce248d5642c6840d07752183 (diff)
parent19baa213c5a69d4cd0fbe3e430a6c08a78e7acbb (diff)
downloadotp-c694c0be5656bda37fafdef858a82c76bdcf8f14.tar.gz
otp-c694c0be5656bda37fafdef858a82c76bdcf8f14.tar.bz2
otp-c694c0be5656bda37fafdef858a82c76bdcf8f14.zip
Merge branch 'bjorn/beam-max-args/OTP-9049' into dev
* bjorn/beam-max-args/OTP-9049: Refuse to compile functions with too many arguments Lower the maximum arity from 256 to 255
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_vm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h
index 48fa99934e..5b42a2ce11 100644
--- a/erts/emulator/beam/erl_vm.h
+++ b/erts/emulator/beam/erl_vm.h
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -47,7 +47,7 @@
#define SEQ_TRACE 1
#define CONTEXT_REDS 2000 /* Swap process out after this number */
-#define MAX_ARG 256 /* Max number of arguments allowed */
+#define MAX_ARG 255 /* Max number of arguments allowed */
#define MAX_REG 1024 /* Max number of x(N) registers used */
/* Scheduler stores data for temporary heaps if