diff options
author | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 01:46:26 +0000 |
---|---|---|
committer | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 01:46:26 +0000 |
commit | 6669f65a802461d7c9ded94776dd7dff8795b81c (patch) | |
tree | d29160378ee36bbd3814425b9e973ba59daebf41 | |
parent | 192a6be639306d5f27b4f0678138347369b27886 (diff) | |
download | src-6669f65a802461d7c9ded94776dd7dff8795b81c.tar.gz |
Allows the ADDRESS_SANITIZER define to be used on Windows.
Asan is coming on Windows soon with SyzyAsan. We should be able to use the ADDRESS_SANITIZER define. The __attribute__ flag is compiler specific.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11549005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@172767 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 4 | ||||
-rw-r--r-- | src/mesa/program/prog_parameter.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 2f8adcf..6884b5c 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -56,7 +56,7 @@ extern "C" { #include "program/prog_parameter.h" } -#if defined(ADDRESS_SANITIZER) +#if defined(__clang__ ) && defined(ADDRESS_SANITIZER) // Suppress AddressSanitizer reports about OOB reads in swizzle_for_size(). // See also http://crbug.com/139772. __attribute__((no_address_safety_analysis)) @@ -570,7 +570,7 @@ ir_to_mesa_visitor::get_temp(const glsl_type *type) variable_storage * ir_to_mesa_visitor::find_variable_storage(ir_variable *var) { - + variable_storage *entry; foreach_iter(exec_list_iterator, iter, this->variables) { diff --git a/src/mesa/program/prog_parameter.c b/src/mesa/program/prog_parameter.c index c563fd5..7eb8cc8 100644 --- a/src/mesa/program/prog_parameter.c +++ b/src/mesa/program/prog_parameter.c @@ -97,7 +97,7 @@ _mesa_free_parameter_list(struct gl_program_parameter_list *paramList) * store all the values (in blocks of 4). * * \param paramList the list to add the parameter to - * \param type type of parameter, such as + * \param type type of parameter, such as * \param name the parameter name, will be duplicated/copied! * \param size number of elements in 'values' vector (1..4, or more) * \param datatype GL_FLOAT, GL_FLOAT_VECx, GL_INT, GL_INT_VECx or GL_NONE. @@ -105,7 +105,7 @@ _mesa_free_parameter_list(struct gl_program_parameter_list *paramList) * \param state state indexes, or NULL * \return index of new parameter in the list, or -1 if error (out of mem) */ -#if defined(ADDRESS_SANITIZER) +#if defined(__clang__ ) && defined(ADDRESS_SANITIZER) // See http://crbug.com/142316. __attribute__((no_address_safety_analysis)) #endif @@ -192,7 +192,7 @@ _mesa_add_named_parameter(struct gl_program_parameter_list *paramList, { return _mesa_add_parameter(paramList, PROGRAM_NAMED_PARAM, name, 4, GL_NONE, values, NULL, 0x0); - + } @@ -587,7 +587,7 @@ _mesa_clone_parameter_list(const struct gl_program_parameter_list *list) else { clone->Parameters[j].Size = p->Size; } - + } clone->StateFlags = list->StateFlags; |