diff options
| author | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
| commit | e789858899a7b36caf11b371a97411a1582a482b (patch) | |
| tree | e8c28b178b32010f73b477b3c65b5ff74437530c /test/Analysis/free.c | |
| parent | 99a5501f5ae5b75017dfc386d4abf648234e85df (diff) | |
| parent | 20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8 (diff) | |
Merge commit '20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8'
Conflicts:
lib/CodeGen/ItaniumCXXABI.cpp
Diffstat (limited to 'test/Analysis/free.c')
| -rw-r--r-- | test/Analysis/free.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Analysis/free.c b/test/Analysis/free.c index 0b283ee5d4..1dfc1082c7 100644 --- a/test/Analysis/free.c +++ b/test/Analysis/free.c @@ -50,7 +50,7 @@ void t10 () { void t11 () { char *p = (char*)__builtin_alloca(2); - free(p); // expected-warning {{Argument to free() was allocated by alloca(), not malloc()}} + free(p); // expected-warning {{Memory allocated by alloca() should not be deallocated}} } void t12 () { |