diff options
| author | Andres Freund <andres@anarazel.de> | 2018-07-22 20:31:22 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2018-07-22 20:31:22 -0700 |
| commit | 1307bc3d45c1a8a72c7483f2a81e72725116f007 (patch) | |
| tree | 219c036b4985405f04a51bdc65522988dd3c97df /src/backend/jit/llvm/llvmjit_expr.c | |
| parent | 013f320dc390e501a766f89c5a8f650f4574d70f (diff) | |
| download | postgresql-1307bc3d45c1a8a72c7483f2a81e72725116f007.tar.gz postgresql-1307bc3d45c1a8a72c7483f2a81e72725116f007.zip | |
Reset context at the tail end of JITed EEOP_AGG_PLAIN_TRANS.
While no negative consequences are currently known, it's clearly wrong
to not reset the context in one of the branches.
Reported-By: Dmitry Dolgov
Author: Dmitry Dolgov
Discussion: https://postgr.es/m/CAGPqQf165-=+Drw3Voim7M5EjHT1zwPF9BQRjLFQzCzYnNZEiQ@mail.gmail.com
Backpatch: 11-, where JIT compilation support was added
Diffstat (limited to 'src/backend/jit/llvm/llvmjit_expr.c')
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_expr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c index 31b03212751..0f3109334e8 100644 --- a/src/backend/jit/llvm/llvmjit_expr.c +++ b/src/backend/jit/llvm/llvmjit_expr.c @@ -2499,6 +2499,8 @@ llvm_compile_expr(ExprState *state) /* store trans value */ LLVMBuildStore(b, v_newval, v_transvaluep); LLVMBuildStore(b, v_fcinfo_isnull, v_transnullp); + + l_mcxt_switch(mod, b, v_oldcontext); LLVMBuildBr(b, opblocks[i + 1]); /* returned datum passed datum, no need to reparent */ |